Ignored revisions: 12346
Ignoring 4203 ancestors included in old builds.
included in: 221559
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16551">16551:f7848c903b81</a>
tag:         tip
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16549">16549:e9fb0191129f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16550">16550:bc3c6529f359</a>
user:        Dave Parks <davep@lindenlab.com>
date:        Thu Feb 17 16:07:00 2011 -0600
summary:     merge

included in: 221559
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16550">16550:bc3c6529f359</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16537">16537:90f4e50242dc</a>
user:        Dave Parks <davep@lindenlab.com>
date:        Thu Feb 17 16:06:34 2011 -0600
summary:     SH-547 Use appropriate texture channel for rendering avatars into their impostor map.

codeticket:  221535
included in: 221559
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16549">16549:e9fb0191129f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16547">16547:a17a7fcc9721</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16548">16548: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

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