Ignored revisions: 12346
Ignoring 3848 ancestors included in old builds.
included in: 219156
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16196">16196:146862b106b8</a>
tag:         tip
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16195">16195:666a2363d679</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16194">16194:c5851cd44a9c</a>
user:        prep linden <prep@lindenlab.com>
date:        Fri Jan 14 15:30:57 2011 -0500
summary:     merge

codeticket:  219105
included in: 219156
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16194">16194:c5851cd44a9c</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16190">16190:9b0f196a5b06</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16193">16193:422f636c3343</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Fri Jan 14 15:16:37 2011 -0500
summary:     Automated merge up from viewer-development

included in: 219156
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16195">16195:666a2363d679</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16094">16094:75d15b448a77</a>
user:        prep linden <prep@lindenlab.com>
date:        Fri Jan 14 15:00:19 2011 -0500
summary:     voice dot is positioned consistently

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