Ignored revisions: 12346
Ignoring 3945 ancestors included in old builds.
included in: 220116
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16399">16399:486d7cc72a2d</a>
tag:         tip
user:        Loren Shih <seraph@lindenlab.com>
date:        Tue Feb 01 12:33:39 2011 -0500
summary:     Fixes for merge up from viewer-development to mesh-development.

included in: 220116
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16398">16398:6703fb9e20d5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16306">16306:9bad6fda4237</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16397">16397:33fc9ed99d29</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Tue Feb 01 11:28:22 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

codeticket:  220115
included in: 220116
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16397">16397:33fc9ed99d29</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16396">16396:e94c02901c75</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16384">16384:b575bde7d5e8</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Tue Feb 01 07:22:32 2011 -0500
summary:     merge changes back from beta branch

codeticket:  220029
included in: 220115
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16384">16384:b575bde7d5e8</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16383">16383:b5c3758a8079</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16382">16382:127f6fc35c12</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:34:17 2011 -0500
summary:     merge changes for storm-845

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16382">16382:127f6fc35c12</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16381">16381:45640415ef0d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16380">16380:80c054b156c8</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:32:57 2011 -0500
summary:     merge changes for storm-829

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16380">16380:80c054b156c8</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16379">16379:6f044de78d1d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16378">16378:41771155b350</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:26:23 2011 -0500
summary:     merge changes for storm-643

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16378">16378:41771155b350</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16377">16377:d9a5183dfb95</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16376">16376:691e3941d950</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:25:35 2011 -0500
summary:     merge changes for storm-351

codeticket:  219999
included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16376">16376:691e3941d950</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16374">16374:fe7fe04ccc9a</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16375">16375:57e9ad7b408c</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Sat Jan 29 15:35:54 2011 -0500
summary:     Automated merge with file:///Users/oz/Work/V-D

codeticket:  219998
included in: 219999
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16375">16375:57e9ad7b408c</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16368">16368:45a63ad4d737</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Sat Jan 29 13:09:55 2011 -0500
summary:     correct DOS line endings

codeticket:  219959
included in: 219998
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16368">16368:45a63ad4d737</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16367">16367:1237987d1af9</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16359">16359:54109970bb3f</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 28 17:05:11 2011 -0500
summary:     pull back fixes from beta

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16359">16359:54109970bb3f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16358">16358:b43d93d380a5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16344">16344:b542f8134a2b</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 19:04:26 2011 -0500
summary:     merge beta tags

codeticket:  219808
included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16344">16344:b542f8134a2b</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16343">16343:e5ed8fd3dc3d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16334">16334:47188cac296f</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 13:03:15 2011 -0500
summary:     Automated merge with file:///Users/oz/Work/V-DR

included in: 219808
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16334">16334:47188cac296f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16333">16333:ffd632c2fa5d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16331">16331:6094386369a0</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 13:01:55 2011 -0500
summary:     merge changes for beta fixes

codeticket:  219758
included in: 219808
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16331">16331:6094386369a0</a>
user:        David Kaprielian <sabin@lindenlab.com>
date:        Wed Jan 26 15:07:54 2011 -0800
summary:     Adding run_tests buildparam and setting to false for coverity builds so coverity can run.

codeticket:  219652
included in: 219758
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16330">16330:38ed1abd9cd9</a>
user:        Vadim ProductEngine <vsavchuk@productengine.com>
date:        Tue Jan 25 17:10:23 2011 -0500
summary:     correct build error

codeticket:  219558
included in: 219652
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16329">16329:26c09ad4293e</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16313">16313:180c8272f58e</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16328">16328: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://hg.secondlife.com/mesh-development/changeset/16328">16328: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://hg.secondlife.com/mesh-development/changeset/16327">16327:787dbfc37f0e</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16326">16326:d41267ba94a2</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16299">16299:c9fff5355807</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 21 16:26:35 2011 -0700
summary:     Merge

codeticket:  219427
included in: 219558
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16299">16299:c9fff5355807</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16298">16298:887c9baf5034</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16295">16295:faf2d8c8bf7b</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 21 15:29:40 2011 -0500
summary:     merge changes for storm-844

included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16295">16295:faf2d8c8bf7b</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16294">16294:743a85de0bc5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16293">16293:9acbdea99665</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 21 15:14:39 2011 -0500
summary:     merge changes for storm-869

included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16293">16293:9acbdea99665</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16292">16292:145b2cd42ef3</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16255">16255:453bcacca4e7</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 21 15:11:20 2011 -0500
summary:     merge changes for storm-874/ER-428: fix lost movement updates when walking

codeticket:  219252
included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16292">16292:145b2cd42ef3</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16219">16219:38465c40c060</a>
user:        Dave SIMmONs <simon@lindenlab.com>
date:        Wed Jan 19 12:54:05 2011 -0800
summary:     ER-428 / CTS-422 : [PUBLIC] movement updates are lost when walking.  Changed code to detect if the circuit has stopped getting packets.  Reviewed by Andrew

included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16294">16294:743a85de0bc5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/15623">15623:46a990f8296f</a>
user:        Jonathan Yap
date:        Wed Jan 19 06:02:08 2011 -0500
summary:     STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup

included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16298">16298:887c9baf5034</a>
user:        Jonathan Yap
date:        Sun Jan 16 12:10:44 2011 -0500
summary:     STORM-844 Better way of doing "More" should be "Less" when Media Control is open

included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16297">16297:4ab5890d9cd8</a>
user:        Jonathan Yap
date:        Wed Jan 12 10:37:15 2011 -0500
summary:     STORM-844 Minor adjustment to contributions.txt

included in: 219427
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16296">16296:24a779325ec1</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16123">16123:179e0754a27d</a>
user:        Jonathan Yap
date:        Wed Jan 12 08:24:38 2011 -0500
summary:     STORM-844 "More" should be "Less" when Media Control is open

included in: 219558
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16326">16326:d41267ba94a2</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16255">16255:453bcacca4e7</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16325">16325: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://hg.secondlife.com/mesh-development/changeset/16325">16325: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://hg.secondlife.com/mesh-development/changeset/16324">16324: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://hg.secondlife.com/mesh-development/changeset/16323">16323: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://hg.secondlife.com/mesh-development/changeset/16322">16322: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://hg.secondlife.com/mesh-development/changeset/16321">16321: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://hg.secondlife.com/mesh-development/changeset/16320">16320: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://hg.secondlife.com/mesh-development/changeset/16319">16319: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://hg.secondlife.com/mesh-development/changeset/16318">16318: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://hg.secondlife.com/mesh-development/changeset/16317">16317: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://hg.secondlife.com/mesh-development/changeset/16316">16316: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://hg.secondlife.com/mesh-development/changeset/16315">16315: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://hg.secondlife.com/mesh-development/changeset/16314">16314:cd68075130a2</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/15009">15009: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://hg.secondlife.com/mesh-development/changeset/16313">16313:180c8272f58e</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16312">16312:b1ba2bd8309f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16307">16307:586e1cd79607</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 24 14:22:08 2011 -0500
summary:     merge changes for beta fixes

included in: 219505
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16307">16307:586e1cd79607</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16304">16304:e3e61681fbd2</a>
user:        Aleric Inglewood <Aleric.Inglewood@gmail.com>
date:        Mon Jan 24 09:35:41 2011 -0500
summary:     VWR-24321: fix validation of textures that start with 00

codeticket:  219436
included in: 219505
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16304">16304:e3e61681fbd2</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 21 16:20:29 2011 -0500
summary:     add missing entry in contributions.txt for VWR-24347

included in: 219436
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16303">16303:e2cf635db691</a>
user:        Aleric Inglewood <Aleric.Inglewood@gmail.com>
date:        Fri Jan 21 16:02:38 2011 -0500
summary:     VWR-24519: make debugging easier by not spawning spare process

included in: 219436
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16302">16302:2d0799e918c5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16301">16301:935381a4eab5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16300">16300:87006f3ba82d</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 21 15:55:55 2011 -0500
summary:     merge changes for vwr-24347

included in: 219436
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16300">16300:87006f3ba82d</a>
user:        Aleric Inglewood <Aleric.Inglewood@gmail.com>
date:        Fri Jan 21 15:48:12 2011 -0500
summary:     VWR-24354: correct manifest dependencies to prevent parallel install problem

included in: 219436
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16301">16301:935381a4eab5</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/15973">15973:27dae7b01a81</a>
user:        Jonathan Yap
date:        Wed Dec 29 18:25:40 2010 -0500
summary:     VWR-24347 Fix reversion--allow VS2005 Express user to specify location of msvc* files

codeticket:  219483
included in: 219505
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16312">16312:b1ba2bd8309f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16311">16311:746172ee0da1</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16244">16244:54d772d8687c</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 24 11:44:43 2011 -0500
summary:     merge changes for i18n fixes

included in: 219483
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16311">16311:746172ee0da1</a>
user:        Eli Linden <eli@lindenlab.com>
date:        Fri Jan 21 16:11:25 2011 -0800
summary:     INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation (new files) for Viewer 2.5

included in: 219483
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16310">16310:f333637176da</a>
user:        Eli Linden <eli@lindenlab.com>
date:        Fri Jan 21 16:11:09 2011 -0800
summary:     INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation for Viewer 2.5

included in: 219483
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16309">16309:a1b37b733817</a>
user:        Eli Linden <eli@lindenlab.com>
date:        Wed Jan 19 12:16:34 2011 -0800
summary:     sync up with Viewer 2.5 from viewer-beta

included in: 219483
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16308">16308:a5f747380ce9</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/15408">15408:51860c70b3ed</a>
user:        Eli Linden <eli@lindenlab.com>
date:        Wed Jan 19 12:16:23 2011 -0800
summary:     sync up with Viewer 2.5 from viewer-beta

codeticket:  219802
included in: 219808
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16333">16333:ffd632c2fa5d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16332">16332:bb7b701fbbbf</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16312">16312:b1ba2bd8309f</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 08:44:32 2011 -0800
summary:     Merged beta2 tag

included in: 219802
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16332">16332:bb7b701fbbbf</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16244">16244:54d772d8687c</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Wed Jan 26 16:00:46 2011 -0800
summary:     Added tag DRTVWR-33--2.5.0beta2 for changeset 54d772d8687c

codeticket:  219800
included in: 219808
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16343">16343:e5ed8fd3dc3d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16342">16342:77a7a592c318</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16341">16341:fb6ac6591680</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 09:48:51 2011 -0500
summary:     merge changes for storm-348

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16341">16341:fb6ac6591680</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16340">16340:e2344d4454c4</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16338">16338:c4687b624537</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 09:47:57 2011 -0500
summary:     merge changes for storm-843

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16338">16338:c4687b624537</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16337">16337:3288aca19f87</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16336">16336:095c742f6f9f</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 09:47:22 2011 -0500
summary:     merge changes for storm-547

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16336">16336:095c742f6f9f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16335">16335:63453b39d69e</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16331">16331:6094386369a0</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Thu Jan 27 09:46:39 2011 -0500
summary:     merge changes for storm-373

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16335">16335:63453b39d69e</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16219">16219:38465c40c060</a>
user:        Vadim ProductEngine <vsavchuk@productengine.com>
date:        Wed Jan 19 13:30:05 2011 +0200
summary:     STORM-373 FIXED "Rename" context menu option was disabled for incomplete inventory items.

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16337">16337:3288aca19f87</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16219">16219:38465c40c060</a>
user:        Paul Guslisty <pguslisty@productengine.com>
date:        Wed Jan 19 13:55:39 2011 +0200
summary:     STORM-547 FIXED Name of blocked person is not presented in list if person was blocked from Inspector

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16340">16340:e2344d4454c4</a>
user:        Seth ProductEngine <slitovchuk@productengine.com>
date:        Tue Jan 25 01:13:39 2011 +0200
summary:     STORM-843 FIXED incremental inventory search to use more restrictive or less restrictive filtering.

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16339">16339:7e89d8f45f94</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16329">16329:26c09ad4293e</a>
user:        Seth ProductEngine <slitovchuk@productengine.com>
date:        Tue Jan 25 01:28:46 2011 +0200
summary:     Fixed TestCapabilityProvider build issue.

included in: 219800
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16342">16342:77a7a592c318</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16219">16219:38465c40c060</a>
user:        Vadim ProductEngine <vsavchuk@productengine.com>
date:        Wed Jan 19 21:41:53 2011 +0200
summary:     STORM-348 FIXED "Edit" and "Lock" buttons appearing on body part items in outfit editor before they are hovered with mouse.

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16358">16358:b43d93d380a5</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:45:42 2011 -0800
summary:     Added tag DRTVWR-33_2.5.0-beta2 for changeset 54d772d8687c

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16357">16357:4b8d6aa5f96e</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:45:14 2011 -0800
summary:     Added tag DRTVWR-32_2.5.0-beta1 for changeset 345b17e7cf63

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16356">16356:ef7323702ee2</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:44:57 2011 -0800
summary:     Added tag DRTVWR-25_2.4.0-release for changeset 1ed382c6a08b

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16355">16355:3f4135badde9</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:44:40 2011 -0800
summary:     Added tag DRTVWR-27_2.4.0-beta2 for changeset 25bd6007e3d2

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16354">16354:025ceaa4cf56</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:44:23 2011 -0800
summary:     Added tag DRTVWR-26_2.4.0-beta1 for changeset 3bc1f50a72e1

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16353">16353:aa89478f7040</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:44:05 2011 -0800
summary:     Added tag DRTVWR-13_2.3.0-release for changeset 6ad3d6fa35a4

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16352">16352:c52bb8ad58a7</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:43:49 2011 -0800
summary:     Added tag DRTVWR-20_2.3.0-beta3 for changeset 6ad3d6fa35a4

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16351">16351:1aa180baa8ce</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:43:10 2011 -0800
summary:     Added tag DRTVWR-17_2.3.0-beta2 for changeset db0fe9bb6518

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16350">16350:6d1be2ffde8a</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:42:32 2011 -0800
summary:     Added tag DRTVWR-14_2.3.0-beta1 for changeset a3c12342b1af

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16349">16349:92dd48629eac</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:42:03 2011 -0800
summary:     Added tag DRTVWR-8_2.2.0-release for changeset 1415e6538d54

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16348">16348:263e4859cfe2</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:41:46 2011 -0800
summary:     Added tag DRTVWR-7_2.2.0-beta3 for changeset b0cd7e150009

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16347">16347:ce0d1ed8dc2d</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:41:21 2011 -0800
summary:     Added tag DRTVWR-3_2.2.0-beta2 for changeset 9822eb3e25f7

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16346">16346:4ec5e767b6c3</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 14:40:14 2011 -0800
summary:     Added tag DRTVWR-5_2.2.0-beta1 for changeset 7076e22f9f43

included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16345">16345:fa941b79865b</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16333">16333:ffd632c2fa5d</a>
user:        Dessie Linden <dessie@lindenlab.com>
date:        Thu Jan 27 11:43:08 2011 -0800
summary:     Removed DRTVWR from 2.5.0-beta2 tag

codeticket:  219932
included in: 219959
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16367">16367:1237987d1af9</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16366">16366:8760544e7449</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16363">16363:fc518f2cff05</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 28 14:26:59 2011 -0500
summary:     merge fixes for SOCIAL-452 and STORM-927

codeticket:  219910
included in: 219932
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16363">16363:fc518f2cff05</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16362">16362:f40ad8d0c5ec</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16361">16361:f9bb7807227d</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 28 11:36:46 2011 -0500
summary:     merge changes for storm-634

included in: 219910
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16361">16361:f9bb7807227d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16360">16360:f3acdb1faaa6</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16358">16358:b43d93d380a5</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 28 11:30:17 2011 -0500
summary:     merge changes for social-473

codeticket:  219890
included in: 219910
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16360">16360:f3acdb1faaa6</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16244">16244:54d772d8687c</a>
user:        Richard Linden
date:        Mon Jan 24 18:41:42 2011 -0800
summary:     SOCIAL-473 FIX Add Kick, Freeze, Unfreeze and CSR to profile mini floater drop down

included in: 219910
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16362">16362:f40ad8d0c5ec</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16311">16311:746172ee0da1</a>
user:        Eli Linden <eli@lindenlab.com>
date:        Thu Jan 27 13:33:26 2011 -0800
summary:     STORM-634 FIX missing Danish translation

included in: 219932
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16366">16366:8760544e7449</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16365">16365:d920509e1393</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16358">16358:b43d93d380a5</a>
user:        callum
date:        Fri Jan 28 11:20:36 2011 -0800
summary:     Merge

included in: 219932
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16365">16365:d920509e1393</a>
user:        callum
date:        Fri Jan 28 11:18:11 2011 -0800
summary:     SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be optimized for Web profile display

included in: 219932
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16364">16364:f09beb38f756</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16217">16217:282a16c0bffb</a>
user:        callum
date:        Fri Jan 28 11:17:18 2011 -0800
summary:     STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7

codeticket:  219991
included in: 219999
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16374">16374:fe7fe04ccc9a</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16368">16368:45a63ad4d737</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16373">16373:3aab4a54e6d9</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 28 21:23:35 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

included in: 219991
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16373">16373:3aab4a54e6d9</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 28 21:23:19 2011 -0700
summary:     trivial: remove some debug code.

included in: 219991
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16372">16372:4de3178c6c81</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 28 17:19:42 2011 -0700
summary:     fixed the major memory leaking for SH-723/SH-847: memoy leaking

included in: 219991
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16371">16371:c6bad5df2c9b</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 28 17:01:18 2011 -0700
summary:     trivial: convert to "unix return"

included in: 219991
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16370">16370:39b379b771f0</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Jan 26 17:03:30 2011 -0700
summary:     add "pause" function for SH-846: design and implement the debug code to locate memory leaking

included in: 219991
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16369">16369:c8c4058fe309</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16329">16329:26c09ad4293e</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Wed Jan 26 11:13:04 2011 -0700
summary:     for SH-846: design and implement the debug code to locate memory leaking

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16377">16377:d9a5183dfb95</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16330">16330:38ed1abd9cd9</a>
user:        paul_productengine
date:        Wed Jan 26 20:24:49 2011 +0200
summary:     STORM-351 FIXED Scrolling flat list by mouse wheel changes zoom level in-world

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16379">16379:6f044de78d1d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16331">16331:6094386369a0</a>
user:        Twisted Laws
date:        Wed Jan 26 19:22:42 2011 -0500
summary:     Embed Minimap into the Nearby list of the People Sidebar

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16381">16381:45640415ef0d</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16018">16018:3d755de28394</a>
user:        Jonathan Yap
date:        Thu Jan 06 06:07:11 2011 -0500
summary:     STORM-829 Viewer 2 does not parse /me in object Instant Messages

included in: 220029
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16383">16383:b5c3758a8079</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16304">16304:e3e61681fbd2</a>
user:        Jonathan Yap
date:        Mon Jan 24 16:22:03 2011 -0500
summary:     STORM-845 Icon for nearby chat and nearby voice now is a down arrow when floater is open

codeticket:  220094
included in: 220115
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16396">16396:e94c02901c75</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16395">16395:f904ee733e5f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16394">16394:603fb12649f3</a>
user:        Kent Quirk <q@lindenlab.com>
date:        Mon Jan 31 19:29:18 2011 -0500
summary:     Merge

codeticket:  220033
included in: 220094
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16394">16394:603fb12649f3</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16393">16393:269fafd3fb88</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16391">16391:43f9b2d10aa3</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 13:04:57 2011 -0500
summary:     merge changes for storm-934

included in: 220033
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16391">16391:43f9b2d10aa3</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16390">16390:5dd42f6d8af6</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16367">16367:1237987d1af9</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Mon Jan 31 12:46:58 2011 -0500
summary:     pull changes for STORM-940 and CHOP-369

codeticket:  219828
included in: 220033
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16390">16390:5dd42f6d8af6</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Thu Jan 27 11:37:59 2011 -0800
summary:     STORM-940: use the tip, not the dialog.

included in: 219828
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16389">16389:0a2ebeadc2f5</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Thu Jan 27 11:37:00 2011 -0800
summary:     more for storm 940: treat the manditory download after login like an optional one.

included in: 219828
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16388">16388:04e9ada52f11</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16387">16387:f45bf13b0c5f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16312">16312:b1ba2bd8309f</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Wed Jan 26 16:31:39 2011 -0800
summary:     merge from lindenlab/viewer-beta

included in: 219828
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16387">16387:f45bf13b0c5f</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Wed Jan 26 16:31:15 2011 -0800
summary:     fix for STORM-940: don't show manditory update dialog if already logged in.

codeticket:  219560
included in: 219828
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16386">16386:a531fa1abe74</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Mon Jan 24 14:58:10 2011 -0800
summary:     a less brain dead fix for CHOP-369

codeticket:  219496
included in: 219560
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16385">16385:b2304fc8e9f6</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16244">16244:54d772d8687c</a>
user:        Andrew A. de Laix <alain@lindenlab.com>
date:        Mon Jan 24 10:54:08 2011 -0800
summary:     fix CHOP-369: catch case of synchronous download failure.

included in: 220033
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16393">16393:269fafd3fb88</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16392">16392:9fb7940a8e61</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16367">16367:1237987d1af9</a>
user:        callum
date:        Fri Jan 28 15:59:19 2011 -0800
summary:     Merge with head

included in: 220033
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16392">16392:9fb7940a8e61</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16366">16366:8760544e7449</a>
user:        callum
date:        Fri Jan 28 15:57:42 2011 -0800
summary:     STORM-934 POSSIBLE FIX [crashhunters] crash at [2] LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp]

included in: 220094
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16395">16395:f904ee733e5f</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16367">16367:1237987d1af9</a>
user:        Kent Quirk <q@lindenlab.com>
date:        Mon Jan 31 19:18:58 2011 -0500
summary:     VWR-22024 -- apply Bao's patch to beta

included in: 220116
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16306">16306:9bad6fda4237</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16305">16305:cbc24e0266b6</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16291">16291:f07ea01e8291</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Tue Feb 01 11:16:43 2011 -0500
summary:     Automated merge from mesh-development

codeticket:  220114
included in: 220116
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16291">16291:f07ea01e8291</a>
user:        Dave Parks <davep@lindenlab.com>
date:        Tue Feb 01 03:13:47 2011 -0600
summary:     SH-831 Fix for local lights option not disabling local lights.

included in: 220116
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16305">16305:cbc24e0266b6</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16263">16263:f8ecc3530edd</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16304">16304:e3e61681fbd2</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Mon Jan 24 10:56:40 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

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