Ignored revisions: 12346
included in: 222164
changeset:   16598:ef904e84472f
tag:         tip
parent:      16586:b0d66e4df62e
parent:      16597:767feb16f05f
user:        Loren Shih 
date:        Mon Feb 28 11:05:33 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

codeticket:  222124
included in: 222164
changeset:   16597:767feb16f05f
parent:      16595:26d968c2a973
parent:      16596:9889cdb29915
user:        Merov Linden 
date:        Fri Feb 25 15:44:38 2011 -0800
summary:     STORM-980 : pull into viewer-development

included in: 222124
changeset:   16596:9889cdb29915
parent:      16494:e3f87f72e083
user:        Jonathan Yap
date:        Fri Feb 11 05:17:05 2011 -0500
summary:     STORM-980 Appearance panel / Wear button is too wide

Found Known Changeset:
codeticket:  220801
included in: 222124
changeset:   16494:e3f87f72e083
parent:      16491:fa683e402285
parent:      16493:722eda82ef7d
user:        Merov Linden 
date:        Wed Feb 09 20:18:26 2011 -0800
summary:     STORM-986 : pull into viewer-development

included in: 222124
changeset:   16595:26d968c2a973
parent:      16591:a1a97e19deb2
parent:      16594:40e6a567eb02
user:        Merov Linden 
date:        Fri Feb 25 15:42:07 2011 -0800
summary:     STORM-974 : pull into viewer-development

included in: 222124
changeset:   16594:40e6a567eb02
user:        Jonathan Yap
date:        Tue Feb 08 08:19:21 2011 -0500
summary:     STORM-974 Removed my change to flip down-arrow to an up-arrow in the Landmark panel.  Not in scope of this jira.

included in: 222124
changeset:   16593:8470d60cfddd
user:        Jonathan Yap
date:        Mon Feb 07 11:53:08 2011 -0500
summary:     STORM-974 forgot to edit contributions.txt

included in: 222124
changeset:   16592:60527ffdb3e2
parent:      16456:b0bceb572090
user:        Jonathan Yap
date:        Mon Feb 07 11:48:55 2011 -0500
summary:     STORM-974 UI button alignment issues in Landmark, About Land, and Hardware Settings windows

Found Known Changeset:
codeticket:  220434
included in: 222124
changeset:   16456:b0bceb572090
user:        Merov Linden 
date:        Fri Feb 04 16:38:26 2011 -0800
summary:     STORM-610 : Backing out that change (test fail)

included in: 222124
changeset:   16591:a1a97e19deb2
parent:      16589:6e3dc6912d48
parent:      16590:98f321fb1895
user:        Merov Linden 
date:        Fri Feb 25 15:40:32 2011 -0800
summary:     STORM-680 : pull into viewer-development

included in: 222124
changeset:   16590:98f321fb1895
parent:      16510:ec4ad7e3ecca
user:        paul_productengine
date:        Fri Feb 11 13:49:10 2011 +0200
summary:     STORM-680 FIXED (Avaline callers are added to the Recent list)

Found Known Changeset:
codeticket:  220842
included in: 222124
changeset:   16510:ec4ad7e3ecca
parent:      16494:e3f87f72e083
parent:      16509:7a1440277911
user:        Merov Linden 
date:        Thu Feb 10 11:56:06 2011 -0800
summary:     STORM-986 : Fix for Linux build

included in: 222124
changeset:   16589:6e3dc6912d48
parent:      16587:2f561a61f5e7
parent:      16588:8a8179ae3dd2
user:        Merov Linden 
date:        Fri Feb 25 15:39:01 2011 -0800
summary:     STORM-979 : pull into viewer-development

included in: 222124
changeset:   16588:8a8179ae3dd2
parent:      16494:e3f87f72e083
user:        Jonathan Yap
date:        Thu Feb 10 15:22:36 2011 -0500
summary:     STORM-979 selection outline from inventory bottom panel buttons is cut at the left side when clicked.

Found Known Changeset:
codeticket:  220801
included in: 222124
changeset:   16494:e3f87f72e083
parent:      16491:fa683e402285
parent:      16493:722eda82ef7d
user:        Merov Linden 
date:        Wed Feb 09 20:18:26 2011 -0800
summary:     STORM-986 : pull into viewer-development

included in: 222124
changeset:   16587:2f561a61f5e7
parent:      16584:1bc100746447
user:        Merov Linden 
date:        Fri Feb 25 15:32:58 2011 -0800
summary:     Fix llhost integration test: replaced linux.org by lindenlab.com in the DNS lookup test as linux.org was not being resolved as expected

Found Known Changeset:
codeticket:  221902
included in: 222124
changeset:   16584:1bc100746447
parent:      16570:00d6a54738ba
user:        Xiaohong Bao 
date:        Wed Feb 23 11:41:13 2011 -0700
summary:     separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.

Found Known Changeset:
codeticket:  222037
included in: 222164
changeset:   16586:b0d66e4df62e
parent:      16583:50eac09294be
parent:      16585:46e60e1b82fc
user:        Xiaohong Bao 
date:        Thu Feb 24 16:21:19 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/mesh-development