Ignored revisions: 12346
Ignoring 2342 ancestors included in old builds.
included in: 220210
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14690">14690:763d54b1924f</a>
tag:         tip
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14688">14688:a01b6bafdacd</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14689">14689:9a85b0f1ce37</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Feb 02 12:43:15 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

included in: 220210
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14689">14689:9a85b0f1ce37</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14685">14685:ebd53632620a</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Feb 02 12:42:59 2011 -0700
summary:     fix for Sh-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files

codeticket:  220180
included in: 220210
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14688">14688:a01b6bafdacd</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14687">14687:2ccf14fd3384</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14685">14685:ebd53632620a</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Tue Feb 01 17:58:50 2011 -0800
summary:     Sync with viewer-development

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