completed: Fri Jan 14 22:33:54 2011
. [ default ] . changeset: 16194:c5851cd44a9c . tag: tip . parent: 16190:9b0f196a5b06 . parent: 16193:422f636c3343 . user: Loren Shih <seraph@lindenlab.com> . date: Fri Jan 14 15:16:37 2011 -0500 . summary: Automated merge up from viewer-development . . [ default ] . . changeset: 16193:422f636c3343 . . parent: 16187:6f8ba8196f6f . . parent: 16192:c2f48c6b37c4 . . user: Merov Linden <merov@lindenlab.com> . . date: Fri Jan 14 10:28:29 2011 -0800 . . summary: STORM-830 : pull into viewer-development . . . [ default ] . . . changeset: 16192:c2f48c6b37c4 . . . user: Jonathan Yap . . . date: Mon Jan 10 17:24:34 2011 -0500 . . . summary: STORM-830 Per Aleric's and Q's suggestion set initial value of mInternalGain to -1 . . . changeset: 16191:9a2bce01b0ce . . . parent: 16023:6d44f0d85a80 . . . user: Jonathan Yap . . . date: Thu Jan 06 16:53:31 2011 -0500 . . . summary: STORM-830 Volume slider isn't properly remembered if set to zero . . [ default ] . . changeset: 16187:6f8ba8196f6f . . parent: 16185:a2229c07997c . . parent: 16186:d031c643fe11 . . user: Oz Linden <oz@lindenlab.com> . . date: Thu Jan 13 17:10:20 2011 -0500 . . summary: Automated merge with file:///Users/oz/Work/V-D . . . [ default ] . . . changeset: 16186:d031c643fe11 . . . parent: 16182:dc0b4e1f02d2 . . . user: Aaron Stone <stone@lindenlab.com> . . . date: Fri Jan 07 18:30:03 2011 +0000 . . . summary: Switch inventory capabilities to FetchInventory2 and family. . . . changeset: 16182:dc0b4e1f02d2 . . . parent: 16181:172fdb7110d7 . . . parent: 16148:5f4034c58817 . . . user: Don Kjer <don@lindenlab.com> . . . date: Wed Jan 12 19:00:36 2011 -0800 . . . summary: Merge with viewer-development . . . . [ default ] . . . . changeset: 16148:5f4034c58817 . . . . parent: 16145:01bdbbb05f3c . . . . parent: 16147:222ebe6524df . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 12:09:49 2011 -0800 . . . . summary: STORM-720 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16147:222ebe6524df . . . . . user: Vadim ProductEngine <vsavchuk@productengine.com> . . . . . date: Mon Jan 10 22:29:29 2011 +0200 . . . . . summary: STORM-720 ADDITIONAL_FIX Typo in PT locale . . . . . changeset: 16146:1b5275d6c281 . . . . . parent: 16082:bceb13778d1d . . . . . user: Vadim ProductEngine <vsavchuk@productengine.com> . . . . . date: Mon Jan 10 22:25:22 2011 +0200 . . . . . summary: STORM-720 FIXED Disabled highlighting URLs in inventory items names in the share confirmation dialog. . . . . [ default ] . . . . changeset: 16145:01bdbbb05f3c . . . . parent: 16143:20b857258598 . . . . parent: 16144:1929638da67f . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 12:08:30 2011 -0800 . . . . summary: STORM-387 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16144:1929638da67f . . . . . parent: 15684:f5f1142c1516 . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . date: Mon Dec 20 19:39:32 2010 +0200 . . . . . summary: STORM-387 FIXED Part of the table is hided after increasing firsts column width in the floater and then dock it to the SP . . . . [ default ] . . . . changeset: 16143:20b857258598 . . . . parent: 16140:d1416aaf7da5 . . . . parent: 16142:6f5cb303d3e2 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 12:07:03 2011 -0800 . . . . summary: STORM-477 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16142:6f5cb303d3e2 . . . . . user: Seth ProductEngine <slitovchuk@productengine.com> . . . . . date: Tue Jan 11 19:50:58 2011 +0200 . . . . . summary: STORM-477 FIXED Re-implemented LLDir::getNextFileInDir() as an iterator object. . . . . . changeset: 16141:959f9340da92 . . . . . parent: 16122:0ba171198594 . . . . . user: Seth ProductEngine <slitovchuk@productengine.com> . . . . . date: Fri Dec 17 22:16:14 2010 +0200 . . . . . summary: STORM-477 WIP Re-implemented LLDir::getNextFileInDir() as an iterator object. . . . . . changeset: 16122:0ba171198594 . . . . . parent: 16098:409e527b267c . . . . . parent: 16121:22684a90f4b7 . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . date: Tue Jan 11 09:03:18 2011 -0800 . . . . . summary: STORM-807 : pull into viewer-development . . . . . . [ default ] . . . . . . changeset: 16121:22684a90f4b7 . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . date: Mon Jan 10 18:01:16 2011 -0800 . . . . . . summary: STORM-807 : Clean up code as discussed with Andrew . . . . . . changeset: 16120:94cd40084e39 . . . . . . parent: 16119:a6dc92b40f43 . . . . . . parent: 16117:91572fa89a95 . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Fri Jan 07 15:22:33 2011 -0800 . . . . . . summary: merge . . . . . . . [ default ] . . . . . . . changeset: 16117:91572fa89a95 . . . . . . . parent: 16116:f8c793d4214b . . . . . . . parent: 15934:43cf4a37774c . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . date: Wed Dec 29 12:39:58 2010 -0800 . . . . . . . summary: merge . . . . . . . changeset: 16116:f8c793d4214b . . . . . . . parent: 16115:a4b0f72a8428 . . . . . . . parent: 16114:ba6d29a97383 . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . date: Wed Dec 29 11:56:28 2010 -0800 . . . . . . . summary: merge . . . . . . . . [ default ] . . . . . . . . changeset: 16114:ba6d29a97383 . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . date: Wed Dec 22 10:47:18 2010 -0800 . . . . . . . . summary: Setting viewer version numbers back to what they were as per Merov's review request. . . . . . . . . changeset: 16113:62a49ded5d10 . . . . . . . . parent: 16112:957a5a86fc7d . . . . . . . . parent: 16111:356463c07f65 . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . date: Wed Dec 22 10:28:16 2010 -0800 . . . . . . . . summary: merge . . . . . . . . . [ default ] . . . . . . . . . changeset: 16111:356463c07f65 . . . . . . . . . parent: 16110:ba91fa7a08dc . . . . . . . . . parent: 15765:fc82190a3f0c . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Wed Dec 22 09:54:45 2010 -0800 . . . . . . . . . summary: merge . . . . . . . . . changeset: 16110:ba91fa7a08dc . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Mon Dec 20 09:03:59 2010 -0800 . . . . . . . . . summary: Fixing windows build error about inequality comparison between S32 and U32. . . . . . . . . . changeset: 16109:c3685093b3bb . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Fri Dec 17 19:52:45 2010 -0800 . . . . . . . . . summary: For object-vs-parcel overlap we now use list of axis aligned boxes . . . . . . . . . changeset: 16108:951514a958b4 . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Wed Dec 15 11:23:00 2010 -0800 . . . . . . . . . summary: ER-407 child bounding boxes not rotated properly for encroachment returnability . . . . . . . . . changeset: 16107:7fdc0b9843a7 . . . . . . . . . parent: 16106:c502fc0874b3 . . . . . . . . . parent: 16104:9dfbf1158ef7 . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Wed Dec 15 08:05:51 2010 -0800 . . . . . . . . . summary: Another merge . . . . . . . . . . [ default ] . . . . . . . . . . changeset: 16104:9dfbf1158ef7 . . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . . date: Fri Dec 10 21:00:58 2010 -0800 . . . . . . . . . . summary: Sigh... another fix for ER-343. Or maybe I forgot to commit the first time? . . . . . . . . . . changeset: 16103:24b93568da3c . . . . . . . . . . parent: 16101:2d93cb1fb361 . . . . . . . . . . parent: 15210:24ff7db40509 . . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . . date: Fri Dec 10 10:40:38 2010 -0800 . . . . . . . . . . summary: merge . . . . . . . . . . changeset: 16101:2d93cb1fb361 . . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . . date: Fri Nov 19 08:36:53 2010 -0800 . . . . . . . . . . summary: Fixing a typo that broke the build. . . . . . . . . . . changeset: 16100:5ab7c6ca57e2 . . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . . date: Thu Nov 18 15:55:53 2010 -0800 . . . . . . . . . . summary: Added viewer-side "object overlaps parcel" check encroachment returnabilty UI . . . . . . . . . . changeset: 16099:3f36cc8e1743 . . . . . . . . . . parent: 14978:03e89ba6cd9f . . . . . . . . . . parent: 14961:7ed69ee6377d . . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . . date: Tue Nov 16 07:01:11 2010 -0800 . . . . . . . . . . summary: merge . . . . . . . . . [ default ] . . . . . . . . . changeset: 16106:c502fc0874b3 . . . . . . . . . parent: 16105:71f6586b0c18 . . . . . . . . . parent: 16102:fbfc8c5a50ab . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Wed Dec 15 08:03:49 2010 -0800 . . . . . . . . . summary: merge . . . . . . . . . . [ default ] . . . . . . . . . . changeset: 16102:fbfc8c5a50ab . . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . . date: Mon Dec 06 15:47:35 2010 -0800 . . . . . . . . . . summary: ER-343 viewer UI does not correctly enable/disable object return . . . . . . . . . [ default ] . . . . . . . . . changeset: 16105:71f6586b0c18 . . . . . . . . . parent: 16103:24b93568da3c . . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . . date: Tue Dec 14 08:52:33 2010 -0800 . . . . . . . . . summary: ER-398 viewer's encroachment logic only uses bounding box of root prim . . . . . . . . [ default ] . . . . . . . . changeset: 16112:957a5a86fc7d . . . . . . . . parent: 15765:fc82190a3f0c . . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . . date: Wed Dec 22 10:06:36 2010 -0800 . . . . . . . . summary: removing some very old debug spam . . . . . . . [ default ] . . . . . . . changeset: 16115:a4b0f72a8428 . . . . . . . parent: 16110:ba91fa7a08dc . . . . . . . parent: 15765:fc82190a3f0c . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . date: Wed Dec 22 09:36:12 2010 -0800 . . . . . . . summary: merge . . . . . . [ default ] . . . . . . changeset: 16119:a6dc92b40f43 . . . . . . parent: 16118:f3ff2aab7984 . . . . . . parent: 16077:78fae8ca1b36 . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Fri Jan 07 15:22:22 2011 -0800 . . . . . . summary: merge . . . . . . changeset: 16118:f3ff2aab7984 . . . . . . parent: 16103:24b93568da3c . . . . . . parent: 16102:fbfc8c5a50ab . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Fri Jan 07 15:20:11 2011 -0800 . . . . . . summary: Adding group owned check for enabling returnability of objects on parcels. . . . . . [ default ] . . . . . changeset: 16098:409e527b267c . . . . . parent: 16082:bceb13778d1d . . . . . parent: 16097:76f586a8e22b . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . date: Mon Jan 10 15:10:11 2011 -0800 . . . . . summary: pull from viewer-beta . . . . . . [ default ] . . . . . . changeset: 16097:76f586a8e22b . . . . . . parent: 16076:6ba181f44396 . . . . . . user: callum . . . . . . date: Mon Jan 10 10:32:36 2011 -0800 . . . . . . summary: SOCIAL-437 FIX Viewer crashes opening My Profile panel . . . . [ default ] . . . . changeset: 16140:d1416aaf7da5 . . . . parent: 16138:602b10761ff7 . . . . parent: 16139:1cbbbe846075 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 12:01:44 2011 -0800 . . . . summary: STORM-723 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16139:1cbbbe846075 . . . . . parent: 15301:2b0da0965dae . . . . . user: Jonathan Yap . . . . . date: Fri Dec 03 10:15:33 2010 -0500 . . . . . summary: Add ability to see Details button in Object Profile for 1-prim objects . . . . [ default ] . . . . changeset: 16138:602b10761ff7 . . . . parent: 16136:cea89a3fa0cf . . . . parent: 16137:af54c54ada75 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:49:42 2011 -0800 . . . . summary: STORM-702 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16137:af54c54ada75 . . . . . parent: 15975:b0bd26c5638a . . . . . user: Vadim ProductEngine <vsavchuk@productengine.com> . . . . . date: Tue Jan 04 13:52:29 2011 +0200 . . . . . summary: STORM-702 FIXED Made it possible to wear partial outfits . . . . [ default ] . . . . changeset: 16136:cea89a3fa0cf . . . . parent: 16133:0a7e0d08557a . . . . parent: 16135:e2cfed90ab4c . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:18:19 2011 -0800 . . . . summary: STORM-615 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16135:e2cfed90ab4c . . . . . user: Jonathan Yap . . . . . date: Wed Dec 01 13:35:30 2010 -0500 . . . . . summary: Forgot to give myself credit . . . . . changeset: 16134:13bbcecef6e9 . . . . . parent: 15260:1fa156b425da . . . . . user: Jonathan Yap . . . . . date: Tue Nov 30 05:46:05 2010 -0500 . . . . . summary: Object menu: put Delete at top level, rename Remove> to Manage> . . . . [ default ] . . . . changeset: 16133:0a7e0d08557a . . . . parent: 16131:6c3f36d794ac . . . . parent: 16132:295c3eef7263 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:14:17 2011 -0800 . . . . summary: STORM-514 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16132:295c3eef7263 . . . . . parent: 16018:3d755de28394 . . . . . user: Seth ProductEngine <slitovchuk@productengine.com> . . . . . date: Thu Jan 06 01:01:21 2011 +0200 . . . . . summary: STORM-514 FIXED Replaced missing textures names in Side Tray params. . . . . [ default ] . . . . changeset: 16131:6c3f36d794ac . . . . parent: 16129:f51634ec3970 . . . . parent: 16130:fc7e5dcf3059 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:12:56 2011 -0800 . . . . summary: STORM-797 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16130:fc7e5dcf3059 . . . . . parent: 16082:bceb13778d1d . . . . . user: Seth ProductEngine <slitovchuk@productengine.com> . . . . . date: Thu Dec 30 18:18:33 2010 +0200 . . . . . summary: STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names. . . . . [ default ] . . . . changeset: 16129:f51634ec3970 . . . . parent: 16127:e28a980872e8 . . . . parent: 16128:4f12274129d7 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:11:17 2011 -0800 . . . . summary: STORM-393 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16128:4f12274129d7 . . . . . parent: 16018:3d755de28394 . . . . . user: Vadim ProductEngine <vsavchuk@productengine.com> . . . . . date: Thu Jan 06 15:51:38 2011 +0200 . . . . . summary: STORM-393 FIXED Changed group SLURL color to be the same as in other URLs. . . . . [ default ] . . . . changeset: 16127:e28a980872e8 . . . . parent: 16125:12f8501ff1e9 . . . . parent: 16126:5c9989624a1e . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:09:46 2011 -0800 . . . . summary: STORM-385 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16126:5c9989624a1e . . . . . parent: 16023:6d44f0d85a80 . . . . . user: Seth ProductEngine <slitovchuk@productengine.com> . . . . . date: Thu Jan 06 22:19:27 2011 +0200 . . . . . summary: STORM-387 FIXED Return key handling by Favorites bar overflow menu. . . . . [ default ] . . . . changeset: 16125:12f8501ff1e9 . . . . parent: 16123:179e0754a27d . . . . parent: 16124:bc1c7580c8b4 . . . . user: Merov Linden <merov@lindenlab.com> . . . . date: Wed Jan 12 11:07:56 2011 -0800 . . . . summary: STORM-370 : pull in viewer-development . . . . . [ default ] . . . . . changeset: 16124:bc1c7580c8b4 . . . . . parent: 16082:bceb13778d1d . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . date: Mon Jan 10 19:15:17 2011 +0200 . . . . . summary: STORM-370 FIXED Human-readable name of region disappears from Location Bar after pressing ESC . . . . [ default ] . . . . changeset: 16123:179e0754a27d . . . . user: Richard Linden . . . . date: Tue Jan 11 16:56:05 2011 -0800 . . . . summary: STORM-823 FIX Tab Key not working properly . . . [ default ] . . . changeset: 16181:172fdb7110d7 . . . user: Don Kjer <don@lindenlab.com> . . . date: Fri Jan 07 14:36:59 2011 -0800 . . . summary: Fix for viewer crash when making the object viewer cache larger . . . changeset: 16180:b57e71cbec54 . . . parent: 16179:575ce65c6618 . . . parent: 16077:78fae8ca1b36 . . . user: Don Kjer <don@lindenlab.com> . . . date: Fri Jan 07 10:48:38 2011 -0800 . . . summary: Merge from viewer-development . . . changeset: 16179:575ce65c6618 . . . user: Don Kjer <don@lindenlab.com> . . . date: Fri Jan 07 10:46:41 2011 -0800 . . . summary: Fix for ER-425: Viewer object cache list gets corrupted when CacheNumberOfRegionsForObjects is exceeded . . . changeset: 16178:4fec4c24e797 . . . parent: 16176:4d3feef42fce . . . parent: 16177:849cf2896a62 . . . user: Don Kjer <don@lindenlab.com> . . . date: Tue Jan 04 12:37:43 2011 -0800 . . . summary: Backed out tiggs' ER-350 change . . . . [ default ] . . . . changeset: 16177:849cf2896a62 . . . . parent: 16173:95afdecc1b05 . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Tue Jan 04 12:37:11 2011 -0800 . . . . summary: Backed out changeset 95afdecc1b05 . . . . changeset: 16173:95afdecc1b05 . . . . parent: 16157:1eac31ff3010 . . . . user: tiggs@lindenlab.com . . . . date: Mon Dec 20 13:54:32 2010 -0500 . . . . summary: fix for ER-350; wait until connection is finished before send update. rvw'd by Nyx . . . . changeset: 16157:1eac31ff3010 . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Wed Dec 08 17:42:47 2010 -0800 . . . . summary: Changed non-windows viewer stats recorder file to live in /tmp . . . . changeset: 16156:b34e9cd0b13b . . . . parent: 16155:08f4dc4856a2 . . . . parent: 15379:f9a293612eea . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Wed Dec 08 17:24:42 2010 -0800 . . . . summary: Merge from http://bitbucket.org/lindenlab/viewer-development . . . . changeset: 16155:08f4dc4856a2 . . . . parent: 15360:e843e274fa58 . . . . parent: 16154:b8037aa937f8 . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Wed Dec 08 17:23:38 2010 -0800 . . . . summary: Merge from http://bitbucket.org/simon_linden/viewer-dev . . . . . [ default ] . . . . . changeset: 16154:b8037aa937f8 . . . . . parent: 15025:bbd5103373ce . . . . . user: Dave SIMmONs <simon@lindenlab.com> . . . . . date: Fri Nov 19 16:49:24 2010 -0800 . . . . . summary: ER-330 : Improve ObjectUpdateCached message packing. Added some viewer metrics, will disable later. . . . [ default ] . . . changeset: 16176:4d3feef42fce . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 23 14:54:41 2010 -0800 . . . summary: Bumping max object cache entries per region to 50k, from 20k (per conversation with maestro about attachments also being included in this set) . . . changeset: 16175:dbeab694aa00 . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 23 14:50:38 2010 -0800 . . . summary: Bumping max number of objects to cache per region to 20k, from 10k. . . . changeset: 16174:530027a32427 . . . parent: 16172:0ef7aae0c1d5 . . . parent: 16173:95afdecc1b05 . . . user: Don Kjer <don@lindenlab.com> . . . date: Wed Dec 22 14:59:56 2010 -0800 . . . summary: Merge with Tiggs . . . changeset: 16172:0ef7aae0c1d5 . . . parent: 16171:5754566b4957 . . . parent: 15848:5d69e36a53ee . . . user: Don Kjer <don@lindenlab.com> . . . date: Wed Dec 22 14:24:28 2010 -0800 . . . summary: Merge with viewer-development . . . changeset: 16171:5754566b4957 . . . user: Don Kjer <don@lindenlab.com> . . . date: Wed Dec 22 14:23:35 2010 -0800 . . . summary: Cleanup from review with Andrew and Merov . . . changeset: 16170:d60fec7ed1a9 . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 16 22:09:49 2010 -0800 . . . summary: ER-414: Add object update type debug rendering view . . . changeset: 16169:7c0a5c6e98a1 . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 16 19:20:47 2010 -0800 . . . summary: Disabled debug viewer stats recorder . . . changeset: 16168:c8d831c353c2 . . . parent: 16153:339fe0f4e424 . . . parent: 16167:85f19b0aeffa . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 16 19:20:13 2010 -0800 . . . summary: Merge from don_linden/viewer-dev . . . . [ default ] . . . . changeset: 16167:85f19b0aeffa . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Thu Dec 16 02:06:39 2010 -0800 . . . . summary: Fix for compile issue . . . . changeset: 16166:e2956982233f . . . . parent: 16165:e771206408d0 . . . . parent: 16151:9d8f853fffc2 . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Wed Dec 15 15:56:44 2010 -0800 . . . . summary: Merged viewer-sandbox . . . . . [ default ] . . . . . changeset: 16151:9d8f853fffc2 . . . . . user: Don Kjer <don@lindenlab.com> . . . . . date: Wed Dec 15 15:56:15 2010 -0800 . . . . . summary: Modified cache purge entry threshold (part of ER-401) . . . . . changeset: 16150:f4110de7b7c4 . . . . . parent: 15644:22c757e8246b . . . . . user: Don Kjer <don@lindenlab.com> . . . . . date: Tue Dec 14 23:56:35 2010 -0800 . . . . . summary: First pass at fix for ER-401: Fix object cache header on the viewer . . . . . [ Transplant ] . . . . . changeset: 16150:f4110de7b7c4 . . . . . parent: 15644:22c757e8246b . . . . . user: Don Kjer <don@lindenlab.com> . . . . . date: Tue Dec 14 23:56:35 2010 -0800 . . . . . summary: First pass at fix for ER-401: Fix object cache header on the viewer . . . . [ default ] . . . . changeset: 16165:e771206408d0 . . . . parent: 16164:646e90d58e9f . . . . parent: 16150:f4110de7b7c4 . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Wed Dec 15 15:47:09 2010 -0800 . . . . summary: Merge from don_linden/viewer-sandbox . . . . changeset: 16164:646e90d58e9f . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Tue Dec 14 23:56:35 2010 -0800 . . . . summary: First pass at fix for ER-401: Fix object cache header on the viewer . . . . changeset: 16163:0a18f3a23d0a . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Tue Dec 14 15:56:09 2010 -0800 . . . . summary: Simple fix for color strength of viewer update goggles. . . . . changeset: 16162:eabd302ca1da . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Mon Dec 13 18:29:31 2010 -0800 . . . . summary: Added in-world color coding to objects based on update type . . . . changeset: 16161:097a0e94a74a . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Mon Dec 13 16:15:25 2010 -0800 . . . . summary: Added object update cache results to viewer stats recorder . . . . changeset: 16160:d717724e3601 . . . . parent: 16159:8b654d19ec3c . . . . parent: 15591:3d2e71443c58 . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Mon Dec 13 12:34:39 2010 -0800 . . . . summary: Merge from viewer-development . . . . changeset: 16159:8b654d19ec3c . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Mon Dec 13 12:33:19 2010 -0800 . . . . summary: Expanded viewer stats recorder to include cache miss type, cache miss requests, and update failures . . . . changeset: 16158:30929e7d32ac . . . . user: Don Kjer <don@lindenlab.com> . . . . date: Thu Dec 09 20:02:36 2010 -0800 . . . . summary: Expanded viewer stats recorder metrics to include all object update types . . . [ default ] . . . changeset: 16153:339fe0f4e424 . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 16 19:19:20 2010 -0800 . . . summary: Dummy placeholder code for ER-414: Add object update type debug rendering view . . . changeset: 16152:507722b45331 . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 16 02:06:39 2010 -0800 . . . summary: Fix for compile issue . . . [ Transplant ] . . . changeset: 16152:507722b45331 . . . user: Don Kjer <don@lindenlab.com> . . . date: Thu Dec 16 02:06:39 2010 -0800 . . . summary: Fix for compile issue . . [ default ] . . changeset: 16185:a2229c07997c . . parent: 16184:c9cc202293b7 . . parent: 16182:dc0b4e1f02d2 . . user: Merov Linden <merov@lindenlab.com> . . date: Thu Jan 13 11:30:56 2011 -0800 . . summary: Pull sync to viewer-development . . changeset: 16184:c9cc202293b7 . . user: Merov Linden <merov@lindenlab.com> . . date: Thu Jan 13 11:17:04 2011 -0800 . . summary: STORM-477 : backout changeset 959f9340da92 . . changeset: 16183:b62b260aa04d . . parent: 16148:5f4034c58817 . . user: Merov Linden <merov@lindenlab.com> . . date: Thu Jan 13 11:15:47 2011 -0800 . . summary: STORM-477 : backout changeset 6f5cb303d3e2 . [ default ] . changeset: 16190:9b0f196a5b06 . parent: 16189:27a94a5ec12e . parent: 16094:75d15b448a77 . user: Loren Shih <seraph@lindenlab.com> . date: Fri Jan 14 15:16:21 2011 -0500 . summary: Automated merge from mesh-development . changeset: 16189:27a94a5ec12e . user: Loren Shih <seraph@lindenlab.com> . date: Fri Jan 14 15:16:17 2011 -0500 . summary: Mesh-development work in progress . changeset: 16188:ff933229aca9 . parent: 16149:d077dd931923 . parent: 16187:6f8ba8196f6f . user: Loren Shih <seraph@lindenlab.com> . date: Fri Jan 14 14:16:07 2011 -0500 . summary: Automated merge up from viewer-development . changeset: 16149:d077dd931923 . parent: 16096:769fad560ab3 . parent: 16148:5f4034c58817 . user: Loren Shih <seraph@lindenlab.com> . date: Thu Jan 13 10:28:15 2011 -0500 . summary: Automated merge up from viewer-development . changeset: 16096:769fad560ab3 . parent: 16095:fe423ddc6e75 . parent: 16093:a5da4942a3bf . user: Loren Shih <seraph@lindenlab.com> . date: Thu Jan 13 10:23:47 2011 -0500 . summary: Automated merge from mesh-development . changeset: 16095:fe423ddc6e75 . parent: 16083:ba2dd06ffcb8 . user: Loren Shih <seraph@lindenlab.com> . date: Wed Jan 12 17:35:31 2011 -0500 . summary: SH-717 Viewer crash on exit after Upload model dialog could not be spawned