Ignored revisions: 12346
Ignoring 4202 ancestors included in old builds.
included in: 221540
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16561">16561:bda23dd61d04</a>
tag:         tip
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16548">16548:8c992053b629</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16560">16560:e9fb0191129f</a>
user:        Nyx (Neal Orman) <nyx@lindenlab.com>
date:        Thu Feb 17 14:08:52 2011 -0500
summary:     merge

codeticket:  221535
included in: 221540
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16560">16560:e9fb0191129f</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16558">16558:a17a7fcc9721</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16559">16559:3a7ad5cbaaf1</a>
user:        Nyx (Neal Orman) <nyx@lindenlab.com>
date:        Thu Feb 17 13:53:04 2011 -0500
summary:     Automated merge with https://hg.secondlife.com/mesh-development

included in: 221535
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16559">16559:3a7ad5cbaaf1</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16522">16522:1713461c4934</a>
user:        Nyx (Neal Orman) <nyx@lindenlab.com>
date:        Thu Feb 17 13:52:58 2011 -0500
summary:     SH-959 FIX crash in llflexibleobject.cpp

codeticket:  221528
included in: 221535
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16558">16558:a17a7fcc9721</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16557">16557:ae7278f390eb</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16556">16556:ef292a8d64a2</a>
user:        prep <prep@lindenlab.com>
date:        Thu Feb 17 13:02:04 2011 -0500
summary:     merge

codeticket:  221519
included in: 221528
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16556">16556:ef292a8d64a2</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16552">16552:5100cb65de37</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16555">16555:379da6bd50a5</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Thu Feb 17 10:26:28 2011 -0500
summary:     Mesh-development work in progress

codeticket:  221399
included in: 221519
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16555">16555:379da6bd50a5</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16554">16554:d6736e2c4ba4</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16553">16553:2bf5c7f3c305</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Wed Feb 16 15:52:05 2011 -0500
summary:     merge changes for storm-981

included in: 221399
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16553">16553:2bf5c7f3c305</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16542">16542:58fdb5218596</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Mon Feb 14 14:15:12 2011 -0800
summary:     debug_console is now resizable

included in: 221399
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16554">16554:d6736e2c4ba4</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16501">16501:e3f87f72e083</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Wed Feb 09 22:08:43 2011 -0800
summary:     STORM-981 : Fix Linux link issues when LL_TESTS is ON

codeticket:  221448
included in: 221519
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16552">16552:5100cb65de37</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16551">16551:d6a224c6945d</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16549">16549:4ac78901a5e0</a>
user:        leyla_linden
date:        Wed Feb 16 15:24:53 2011 -0800
summary:     Merge

codeticket:  221441
included in: 221448
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16549">16549:4ac78901a5e0</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16547">16547:90f4e50242dc</a>
user:        prep <prep@lindenlab.com>
date:        Wed Feb 16 17:55:02 2011 -0500
summary:     Fix for problem with pelvis offset

included in: 221448
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16551">16551:d6a224c6945d</a>
user:        leyla_linden
date:        Wed Feb 16 15:24:11 2011 -0800
summary:     SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regions

included in: 221448
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16550">16550:b1d3269acd14</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16547">16547:90f4e50242dc</a>
user:        leyla_linden
date:        Wed Feb 16 14:45:41 2011 -0800
summary:     SH-957 Turning off Atmospheric Shaders greys out Lighting and Shadows options in preferences but does not turn off shadows inworld

included in: 221528
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16557">16557:ae7278f390eb</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16552">16552:5100cb65de37</a>
user:        prep <prep@lindenlab.com>
date:        Thu Feb 17 13:01:29 2011 -0500
summary:     Another part of the pelvis fix. Sh-634

codeticket:  221397
included in: 221540
changeset:   <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16548">16548:8c992053b629</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16525">16525:300efbbbd5d3</a>
parent:      <a href="http://bitbucket.org/nyx/viewer-mesh/changeset/16547">16547:90f4e50242dc</a>
user:        Nyx (Neal Orman) <nyx@lindenlab.com>
date:        Wed Feb 16 15:35:05 2011 -0500
summary:     merge

</pre></body></html>