Ignored revisions: 12346
Ignoring 2248 ancestors included in old builds.
included in: 219558
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14610">14610:26c09ad4293e</a>
tag:         tip
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14594">14594:180c8272f58e</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14609">14609:4c49eb90cd17</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Mon Jan 24 15:51:33 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

included in: 219558
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14609">14609:4c49eb90cd17</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Mon Jan 24 15:50:46 2011 -0700
summary:     fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files

included in: 219558
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14608">14608:787dbfc37f0e</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14607">14607:d41267ba94a2</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14582">14582:c9fff5355807</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 21 16:26:35 2011 -0700
summary:     Merge

included in: 219558
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14607">14607:d41267ba94a2</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14574">14574:453bcacca4e7</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14606">14606:3bf724ecb7c6</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 21 16:25:23 2011 -0700
summary:     Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)

codeticket:  219360
included in: 219558
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14606">14606:3bf724ecb7c6</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Thu Jan 20 15:20:27 2011 -0700
summary:     fix for SH-829: Viewer attempting to load precached images in file types that are not being used.

codeticket:  219309
included in: 219360
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14605">14605:347132b8214c</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Jan 19 21:17:38 2011 -0700
summary:     fix for SH-730: sculpted prim attachment shapes on impostored avatars load very slowly

codeticket:  219195
included in: 219309
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14604">14604:7aadef5d0652</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Tue Jan 18 16:46:33 2011 -0700
summary:     fix for SH-761: Texture Saving Does Not Work

codeticket:  219181
included in: 219195
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14603">14603:5218090cccc1</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Tue Jan 18 14:08:21 2011 -0700
summary:     fix for SH-659: small textures not loaded

included in: 219181
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14602">14602:93d36bbfd793</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Tue Jan 18 10:41:37 2011 -0700
summary:     debug tool to show texture info for SH-659: small textures not loaded.

codeticket:  218672
included in: 219181
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14601">14601:8876644cb519</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 07 15:04:36 2011 -0700
summary:     trivial: for VWR-22353: remove debug code for EXT-6791.

codeticket:  217834
included in: 218672
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14600">14600:cd100ffbfe79</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Thu Dec 23 11:42:17 2010 -0700
summary:     fix for SH-416: crash at LLFace::getGeometryVolume line 1003

codeticket:  217202
included in: 217834
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14599">14599:ba63d96168c1</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Thu Dec 16 17:13:07 2010 -0700
summary:     fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files

included in: 217202
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14598">14598:a71982e12fd9</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Dec 15 17:34:18 2010 -0700
summary:     fix for SH-446: viewer crashed after clearing cache and relogging

included in: 217202
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14597">14597:b601f1121f0f</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Dec 15 17:20:58 2010 -0700
summary:     fix for SH-367: mesh viewer lock up: Problem removing object.cache - errorcode: 13

included in: 217202
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14596">14596:cfa20aad776d</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Tue Dec 14 12:16:39 2010 -0700
summary:     a try fix for SH-212: crash at LLViewerObjectList::removeFromLocalIDTable(LLViewerObject const &) [secondlife-bin llviewerobjectlist.cpp] line 173

included in: 217202
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14595">14595:cd68075130a2</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/13539">13539:b0f2acfb3155</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Mon Dec 13 21:09:52 2010 -0700
summary:     debug code for SH-639: http requests 3X more in viewer 2.4

codeticket:  219505
included in: 219558
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14594">14594:180c8272f58e</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14593">14593:b1ba2bd8309f</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14588">14588:586e1cd79607</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 24 14:22:08 2011 -0500
summary:     merge changes for beta fixes

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