Ignored revisions: 12346
Ignoring 4179 ancestors included in old builds.
included in: 221106
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16527">16527:e299ee6cc823</a>
tag:         tip
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16526">16526:d3015a14bfe7</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16525">16525:f2289753a959</a>
user:        leyla_linden
date:        Mon Feb 14 16:32:36 2011 -0800
summary:     Merge

codeticket:  221050
included in: 221106
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16525">16525:f2289753a959</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16517">16517:84f05bb3f0de</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16524">16524:92e58e51776a</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Mon Feb 14 09:57:32 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

included in: 221106
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16526">16526:d3015a14bfe7</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16508">16508:e9661bfc64c4</a>
user:        leyla_linden
date:        Mon Feb 14 16:31:40 2011 -0800
summary:     SH-956 Turning off Basic Shaders in Preferences > Graphics does not grey out expected Shadows options in Mesh Viewer

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