completed: Mon Jan 10 21:59:44 2011
. [ default ] . changeset: 16086:689c52638bad . tag: tip . parent: 16085:6fbe52ae3309 . parent: 16083:ba2dd06ffcb8 . user: leyla_linden . date: Mon Jan 10 12:10:36 2011 -0800 . summary: Merge . . [ default ] . . changeset: 16083:ba2dd06ffcb8 . . parent: 16071:3b01f78964ba . . parent: 16082:bceb13778d1d . . user: Loren Shih <seraph@lindenlab.com> . . date: Mon Jan 10 11:20:39 2011 -0500 . . summary: Automated merge up from viewer-development . . . [ default ] . . . changeset: 16082:bceb13778d1d . . . parent: 16081:93874c3d90fd . . . parent: 16080:ee57e4400313 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Fri Jan 07 16:45:04 2011 -0500 . . . summary: merge changes for vwr-1095 . . . . [ default ] . . . . changeset: 16080:ee57e4400313 . . . . parent: 16079:512e5384fa9c . . . . parent: 16077:78fae8ca1b36 . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Fri Jan 07 16:44:38 2011 -0500 . . . . summary: merge changes for storm-826 . . . . . [ default ] . . . . . changeset: 16077:78fae8ca1b36 . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . date: Fri Jan 07 12:46:55 2011 -0500 . . . . . summary: increment minor revision number to make version "2.6.0" . . . . . changeset: 16076:6ba181f44396 . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . date: Fri Jan 07 12:37:00 2011 -0500 . . . . . summary: Added tag 2.5.0-start for changeset a82e5b1e22c7 . . . . . changeset: 16075:a82e5b1e22c7 . . . . . tag: 2.5.0-start . . . . . parent: 16074:b7544fffb90c . . . . . parent: 16062:3a6baa028c7c . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . date: Fri Jan 07 10:39:05 2011 -0500 . . . . . summary: merge changes for storm-34 . . . . . . [ default ] . . . . . . changeset: 16062:3a6baa028c7c . . . . . . parent: 16028:cf09cfdae607 . . . . . . parent: 16061:7fe6d32a195c . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . date: Thu Jan 06 21:38:05 2011 -0500 . . . . . . summary: Automated merge with file:///Users/oz/Work/V-D . . . . . . . [ default ] . . . . . . . changeset: 16061:7fe6d32a195c . . . . . . . parent: 16060:464450764bc3 . . . . . . . parent: 16034:eb142fb8cf23 . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . date: Thu Jan 06 19:20:54 2011 -0500 . . . . . . . summary: merge changes for web profiles . . . . . . . . [ default ] . . . . . . . . changeset: 16034:eb142fb8cf23 . . . . . . . . parent: 16033:0bf2a71b49e2 . . . . . . . . parent: 16032:649225f03511 . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . date: Thu Jan 06 14:33:35 2011 -0500 . . . . . . . . summary: merge changes for storm-812 . . . . . . . . . [ default ] . . . . . . . . . changeset: 16032:649225f03511 . . . . . . . . . parent: 16031:925db607bf1c . . . . . . . . . parent: 16030:1adbbfe86638 . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . date: Thu Jan 06 14:32:01 2011 -0500 . . . . . . . . . summary: merge changes for storm-714 . . . . . . . . . . [ default ] . . . . . . . . . . changeset: 16030:1adbbfe86638 . . . . . . . . . . parent: 16029:f1d1b8d67c01 . . . . . . . . . . parent: 16023:6d44f0d85a80 . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . date: Thu Jan 06 14:31:17 2011 -0500 . . . . . . . . . . summary: merge changes for storm-438 . . . . . . . . . . . [ default ] . . . . . . . . . . . changeset: 16023:6d44f0d85a80 . . . . . . . . . . . parent: 16022:3495df7155d2 . . . . . . . . . . . parent: 16021:a929cba7198b . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . date: Wed Jan 05 17:54:12 2011 -0500 . . . . . . . . . . . summary: merge changes for storm-806 . . . . . . . . . . . . [ default ] . . . . . . . . . . . . changeset: 16021:a929cba7198b . . . . . . . . . . . . parent: 16020:25659da27b00 . . . . . . . . . . . . parent: 16018:3d755de28394 . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . date: Wed Jan 05 17:53:37 2011 -0500 . . . . . . . . . . . . summary: merge changes for storm-825 . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . changeset: 16018:3d755de28394 . . . . . . . . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . . . . . . . . date: Wed Jan 05 17:00:07 2011 -0500 . . . . . . . . . . . . . summary: SH-716 FIXED Water reflections should not default to ON for High graphics setting . . . . . . . . . . . . . changeset: 16017:be51a3e9c341 . . . . . . . . . . . . . parent: 16016:384bbeba94ba . . . . . . . . . . . . . parent: 16005:845cab866155 . . . . . . . . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . . . . . . . . date: Wed Jan 05 16:35:09 2011 -0500 . . . . . . . . . . . . . summary: Automated merge from viewer-development . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . changeset: 16005:845cab866155 . . . . . . . . . . . . . . parent: 16004:79cd488e495f . . . . . . . . . . . . . . parent: 16003:d82b031e4835 . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . date: Tue Jan 04 16:46:09 2011 -0500 . . . . . . . . . . . . . . summary: merge changes for storm-398 . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . changeset: 16003:d82b031e4835 . . . . . . . . . . . . . . . parent: 16002:2273d8a83b83 . . . . . . . . . . . . . . . parent: 16001:9aaa1891b740 . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . date: Tue Jan 04 16:45:08 2011 -0500 . . . . . . . . . . . . . . . summary: merge changes for storm-467 . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . changeset: 16001:9aaa1891b740 . . . . . . . . . . . . . . . . parent: 16000:f0a145726c6a . . . . . . . . . . . . . . . . parent: 15999:ac9e50564f23 . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . date: Tue Jan 04 16:44:15 2011 -0500 . . . . . . . . . . . . . . . . summary: merge changes for storm-485 . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . changeset: 15999:ac9e50564f23 . . . . . . . . . . . . . . . . . parent: 15998:bd36f6fe13c6 . . . . . . . . . . . . . . . . . parent: 15992:ffafa1ca7711 . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . date: Tue Jan 04 16:43:26 2011 -0500 . . . . . . . . . . . . . . . . . summary: merge changes for storm-737 . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . changeset: 15992:ffafa1ca7711 . . . . . . . . . . . . . . . . . . parent: 15991:72177a02701d . . . . . . . . . . . . . . . . . . parent: 15989:52ba218e2c37 . . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . . date: Tue Jan 04 16:41:05 2011 -0500 . . . . . . . . . . . . . . . . . . summary: merge changes for storm-466 . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . changeset: 15989:52ba218e2c37 . . . . . . . . . . . . . . . . . . . parent: 15988:696053ac2dbb . . . . . . . . . . . . . . . . . . . parent: 15987:8e98007112f1 . . . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . . . date: Tue Jan 04 16:40:25 2011 -0500 . . . . . . . . . . . . . . . . . . . summary: merge changes for storm-513 . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . changeset: 15987:8e98007112f1 . . . . . . . . . . . . . . . . . . . . parent: 15986:ec873482d2cc . . . . . . . . . . . . . . . . . . . . parent: 15985:51334aca3a6c . . . . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . . . . date: Tue Jan 04 16:39:53 2011 -0500 . . . . . . . . . . . . . . . . . . . . summary: merge changes for storm-493 . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . changeset: 15985:51334aca3a6c . . . . . . . . . . . . . . . . . . . . . parent: 15984:5374725aeb42 . . . . . . . . . . . . . . . . . . . . . parent: 15983:ece48e427728 . . . . . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . date: Tue Jan 04 16:37:59 2011 -0500 . . . . . . . . . . . . . . . . . . . . . summary: merge changes for storm-669 . . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . . changeset: 15983:ece48e427728 . . . . . . . . . . . . . . . . . . . . . . parent: 15982:86ead5666924 . . . . . . . . . . . . . . . . . . . . . . parent: 15975:b0bd26c5638a . . . . . . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . date: Tue Jan 04 16:37:16 2011 -0500 . . . . . . . . . . . . . . . . . . . . . . summary: merge changes for storm-823 . . . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . . . changeset: 15975:b0bd26c5638a . . . . . . . . . . . . . . . . . . . . . . . parent: 15974:40e4b7541f5a . . . . . . . . . . . . . . . . . . . . . . . parent: 15973:27dae7b01a81 . . . . . . . . . . . . . . . . . . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . date: Thu Dec 30 13:11:44 2010 -0500 . . . . . . . . . . . . . . . . . . . . . . . summary: Automated merge from viewer-development . . . . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15973:27dae7b01a81 . . . . . . . . . . . . . . . . . . . . . . . . parent: 15972:e36590d7b2d8 . . . . . . . . . . . . . . . . . . . . . . . . parent: 15934:43cf4a37774c . . . . . . . . . . . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Wed Dec 29 15:29:58 2010 -0500 . . . . . . . . . . . . . . . . . . . . . . . . summary: merge kdu unit tests (storm-744) . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15972:e36590d7b2d8 . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Tue Dec 28 20:00:06 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : Make getMetaData pass when all is stubbed . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15971:ac368a215308 . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Tue Dec 28 18:32:07 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : Throw exception consistently so llkdu fails consistently . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15970:db6091fa70a4 . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Tue Dec 28 15:58:37 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : Fix release building issue . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15969:2ed1b9e1ad74 . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Fri Dec 24 11:36:15 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : Took code review into account, moving stuff back in protected or even private, fix things to work in debug mode, some clean up in j2coj also . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15968:005d5d6d0031 . . . . . . . . . . . . . . . . . . . . . . . . parent: 15967:fdae55c3ed3b . . . . . . . . . . . . . . . . . . . . . . . . parent: 15764:a235486a4af7 . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Wed Dec 22 22:32:14 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : pull from STORM-151 . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15967:fdae55c3ed3b . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Fri Dec 17 22:52:51 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : Add llkdu unit tests, turn on and fix llworldmap unit tests in newview . . . . . . . . . . . . . . . . . . . . . . . . changeset: 15966:8d17f17e224a . . . . . . . . . . . . . . . . . . . . . . . . parent: 15763:9147e116866a . . . . . . . . . . . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . . date: Fri Dec 17 11:30:52 2010 -0800 . . . . . . . . . . . . . . . . . . . . . . . . summary: STORM-744 : Turn llimage/tests/ on again . . . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . . . changeset: 15974:40e4b7541f5a . . . . . . . . . . . . . . . . . . . . . . . parent: 15934:43cf4a37774c . . . . . . . . . . . . . . . . . . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . . . . . . . . . . . . . . . . . . date: Wed Dec 29 15:19:43 2010 -0500 . . . . . . . . . . . . . . . . . . . . . . . summary: SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txt . . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . . changeset: 15982:86ead5666924 . . . . . . . . . . . . . . . . . . . . . . parent: 15973:27dae7b01a81 . . . . . . . . . . . . . . . . . . . . . . user: Andrew Productengine <adyukov@productengine.com> . . . . . . . . . . . . . . . . . . . . . . date: Thu Dec 30 20:18:00 2010 +0200 . . . . . . . . . . . . . . . . . . . . . . summary: STORM-823 FIXED Fixed Tab Key not working properly in floaters. . . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . . changeset: 15984:5374725aeb42 . . . . . . . . . . . . . . . . . . . . . parent: 15672:794ad1fc71d1 . . . . . . . . . . . . . . . . . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . . . . . . . . . . . . . . . . . date: Fri Dec 17 20:11:06 2010 +0200 . . . . . . . . . . . . . . . . . . . . . summary: STORM-669 FIXED 'Security browsing' icon is overlapped by 'More' button in object info mini-inspector . . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . . changeset: 15986:ec873482d2cc . . . . . . . . . . . . . . . . . . . . parent: 15973:27dae7b01a81 . . . . . . . . . . . . . . . . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . . . . . . . . . . . . . . . . date: Thu Dec 30 14:39:17 2010 +0200 . . . . . . . . . . . . . . . . . . . . summary: BUG STORM-493 'Map' button slightly overlaps scroll bar into My Group info->Land/Assets accordion . . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . . changeset: 15988:696053ac2dbb . . . . . . . . . . . . . . . . . . . parent: 15973:27dae7b01a81 . . . . . . . . . . . . . . . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . . . . . . . . . . . . . . . date: Thu Dec 30 14:28:15 2010 +0200 . . . . . . . . . . . . . . . . . . . summary: BUG STORM-513 "Allow media to auto - play" check-box is enable after Media check-box was unchecked . . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . . changeset: 15991:72177a02701d . . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . . date: Tue Dec 28 05:32:43 2010 -0500 . . . . . . . . . . . . . . . . . . summary: STORM-466 Put Twisted Laws name into contributions.txt . . . . . . . . . . . . . . . . . . changeset: 15990:6da8825bd7d0 . . . . . . . . . . . . . . . . . . parent: 15732:8bff9a83660b . . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . . date: Wed Dec 22 08:47:43 2010 -0500 . . . . . . . . . . . . . . . . . . summary: STORM-466 Fix for: minimap cannot be reset to default zoom . . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . . changeset: 15998:bd36f6fe13c6 . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . date: Mon Dec 27 12:06:28 2010 -0500 . . . . . . . . . . . . . . . . . summary: STORM-737 Eliminate commented out line . . . . . . . . . . . . . . . . . changeset: 15997:8a56839b9112 . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . date: Mon Dec 27 08:58:21 2010 -0500 . . . . . . . . . . . . . . . . . summary: STORM-737 A little more code cleanup per Code Review suggestions. . . . . . . . . . . . . . . . . . changeset: 15996:6571564e366a . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . date: Fri Dec 24 18:09:08 2010 -0500 . . . . . . . . . . . . . . . . . summary: STORM-737 Added comment. Combined code to eliminate temporary constant. . . . . . . . . . . . . . . . . . changeset: 15995:acb44eb8a038 . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . date: Fri Dec 24 15:28:46 2010 -0500 . . . . . . . . . . . . . . . . . summary: STORM-737 Removed unnecessary blank link from llpanelmaininventory.cpp . . . . . . . . . . . . . . . . . changeset: 15994:0750dc8bca2f . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . date: Thu Dec 23 15:56:15 2010 -0500 . . . . . . . . . . . . . . . . . summary: STORM-737 Inventory/Recent: Gray out "New Folder" in "+" menu and enable all menu items except "New Folder" when right clicking an item. . . . . . . . . . . . . . . . . . changeset: 15993:66bbf5901a23 . . . . . . . . . . . . . . . . . parent: 15360:e843e274fa58 . . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . . date: Tue Dec 07 10:14:07 2010 -0500 . . . . . . . . . . . . . . . . . summary: Add + control to Inventory/Recent tab . . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . . changeset: 16000:f0a145726c6a . . . . . . . . . . . . . . . . parent: 15918:279f35982a1a . . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . . date: Sun Dec 26 16:03:23 2010 -0500 . . . . . . . . . . . . . . . . summary: STORM-485 Reduced width of 'Cancel' button in Group Invitation floater . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . changeset: 16002:2273d8a83b83 . . . . . . . . . . . . . . . parent: 15675:9d27fafe16dd . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . date: Sat Dec 18 16:44:51 2010 -0500 . . . . . . . . . . . . . . . summary: STORM-467 Fix for minimap zoom does not persist to the next session . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . changeset: 16004:79cd488e495f . . . . . . . . . . . . . . parent: 15591:3d2e71443c58 . . . . . . . . . . . . . . user: Seth ProductEngine <slitovchuk@productengine.com> . . . . . . . . . . . . . . date: Mon Dec 13 20:18:09 2010 +0200 . . . . . . . . . . . . . . summary: STORM-398 FIXED Disabled Nearby Chat toasts while user is in Busy mode. . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . changeset: 16016:384bbeba94ba . . . . . . . . . . . . . parent: 15975:b0bd26c5638a . . . . . . . . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . . . . . . . . date: Wed Jan 05 16:31:29 2011 -0500 . . . . . . . . . . . . . summary: SH-716 FIXED Water reflections should not default to ON for High graphics setting . . . . . . . . . . . . [ default ] . . . . . . . . . . . . changeset: 16020:25659da27b00 . . . . . . . . . . . . parent: 16019:e441dac81c5d . . . . . . . . . . . . parent: 15975:b0bd26c5638a . . . . . . . . . . . . user: Wolfpup Lowenhar<wolfpup67@earthlink.net> . . . . . . . . . . . . date: Thu Dec 30 16:40:10 2010 -0500 . . . . . . . . . . . . summary: STORM-825 : update Merge from viewer-development . . . . . . . . . . . . changeset: 16019:e441dac81c5d . . . . . . . . . . . . parent: 15934:43cf4a37774c . . . . . . . . . . . . user: Wolfpup Lowenhar<wolfpup67@earthlink.net> . . . . . . . . . . . . date: Tue Dec 28 19:14:33 2010 -0500 . . . . . . . . . . . . summary: STORM-825 : Reenable the LLMatrix3::orthogonalize test in llmath/tests/m3math_test.cpp . . . . . . . . . . . [ default ] . . . . . . . . . . . changeset: 16022:3495df7155d2 . . . . . . . . . . . parent: 15765:fc82190a3f0c . . . . . . . . . . . user: Vadim ProductEngine <vsavchuk@productengine.com> . . . . . . . . . . . date: Wed Dec 22 21:48:42 2010 +0200 . . . . . . . . . . . summary: STORM-806 FIXED Enabled external editor for inventory scripts. . . . . . . . . . . [ default ] . . . . . . . . . . changeset: 16029:f1d1b8d67c01 . . . . . . . . . . parent: 15903:d8fef72af99e . . . . . . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . . . . . . date: Thu Dec 23 14:52:57 2010 +0200 . . . . . . . . . . summary: STORM-438 FIXED My inventory floater is not restored if it was minimized and 'Open Attachment' button was pressed in the Group Profile. . . . . . . . . . [ default ] . . . . . . . . . changeset: 16031:925db607bf1c . . . . . . . . . parent: 15924:940cd25d4b78 . . . . . . . . . user: Paul Guslisty <pguslisty@productengine.com> . . . . . . . . . date: Tue Dec 28 19:02:49 2010 +0200 . . . . . . . . . summary: STORM-714 FIXED Webprim's control bar doesn't dissapear after switching to mouselook mode . . . . . . . . [ default ] . . . . . . . . changeset: 16033:0bf2a71b49e2 . . . . . . . . parent: 15903:d8fef72af99e . . . . . . . . user: Jonathan Yap . . . . . . . . date: Thu Dec 23 17:12:37 2010 -0500 . . . . . . . . summary: STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects . . . . . . . [ default ] . . . . . . . changeset: 16060:464450764bc3 . . . . . . . user: callum . . . . . . . date: Thu Jan 06 13:41:04 2011 -0800 . . . . . . . summary: SOCIAL-423 FIX Display name and username are wrong in My Profile tab . . . . . . . changeset: 16059:28f47e5f5c96 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Thu Jan 06 16:31:27 2011 -0500 . . . . . . . summary: Validation check for edit classified and edit pick slapps . . . . . . . changeset: 16058:e3dd2e9b5bd2 . . . . . . . parent: 16057:d4e06124b6f3 . . . . . . . parent: 16023:6d44f0d85a80 . . . . . . . user: callum . . . . . . . date: Thu Jan 06 10:59:41 2011 -0800 . . . . . . . summary: Merge from viewer-development before merge to viewer-development request submitted . . . . . . . changeset: 16057:d4e06124b6f3 . . . . . . . parent: 16056:c54ec20be65a . . . . . . . parent: 16018:3d755de28394 . . . . . . . user: callum . . . . . . . date: Wed Jan 05 15:52:43 2011 -0800 . . . . . . . summary: Merge with viewer-development . . . . . . . changeset: 16056:c54ec20be65a . . . . . . . user: callum . . . . . . . date: Wed Jan 05 15:49:57 2011 -0800 . . . . . . . summary: SOCIAL-304 FIX Modify side panel to reflect Profiles changes . . . . . . . changeset: 16055:ded3f296221b . . . . . . . user: callum . . . . . . . date: Wed Dec 29 13:37:46 2010 -0800 . . . . . . . summary: SOCIAL-401 FIX Change default web profiles URL to something closer to what will be released . . . . . . . changeset: 16054:e026bd9cc0a7 . . . . . . . user: callum . . . . . . . date: Wed Dec 29 13:36:34 2010 -0800 . . . . . . . summary: SOCIAL-403 FIX Update button graphic that opens Web profiles . . . . . . . changeset: 16053:2ae518cc9e4f . . . . . . . user: callum . . . . . . . date: Wed Dec 29 13:35:23 2010 -0800 . . . . . . . summary: SOCIAL-405 FIX Always make Web profiles open in internal Web content floater regardless of prefs . . . . . . . changeset: 16052:1c5d8d64ee4f . . . . . . . parent: 16051:9bdb34108dc5 . . . . . . . parent: 15848:5d69e36a53ee . . . . . . . user: callum . . . . . . . date: Wed Dec 22 15:22:43 2010 -0800 . . . . . . . summary: Merge with tip of viewer-development . . . . . . . changeset: 16051:9bdb34108dc5 . . . . . . . user: prep <prep@lindenlab.com> . . . . . . . date: Thu Dec 09 12:59:27 2010 -0500 . . . . . . . summary: Social-166 . . . . . . . changeset: 16050:62f076052c14 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Tue Dec 07 16:57:52 2010 -0500 . . . . . . . summary: more merge from viewer-development . . . . . . . changeset: 16049:f94cb6b80233 . . . . . . . parent: 16048:1b19471dbac0 . . . . . . . parent: 15379:f9a293612eea . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Tue Dec 07 15:05:57 2010 -0500 . . . . . . . summary: merge viewer-development into web-profiles . . . . . . . changeset: 16048:1b19471dbac0 . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . date: Mon Nov 22 16:28:17 2010 -0500 . . . . . . . summary: WIP avatar properties persist from preference window . . . . . . . changeset: 16047:78ee3ef9351c . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . date: Thu Nov 18 16:22:25 2010 -0500 . . . . . . . summary: misc cleanup . . . . . . . changeset: 16046:eb063809050d . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . date: Thu Nov 18 16:14:20 2010 -0500 . . . . . . . summary: XML fixup . . . . . . . changeset: 16045:e3ebae9c7264 . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . date: Thu Nov 18 16:05:35 2010 -0500 . . . . . . . summary: Move include in search results from profile window to preference privacy pane . . . . . . . changeset: 16044:ac8fc19d3f7b . . . . . . . parent: 16043:c201cac4df01 . . . . . . . parent: 16040:586ab2453093 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Fri Oct 22 11:37:20 2010 -0400 . . . . . . . summary: merge . . . . . . . . [ default ] . . . . . . . . changeset: 16040:586ab2453093 . . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . . date: Thu Oct 21 16:22:27 2010 -0400 . . . . . . . . summary: Added support for map tracking slapp, share slapp and a voice call slapp. . . . . . . . . changeset: 16039:062f057119ae . . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . . date: Thu Oct 21 16:08:13 2010 -0400 . . . . . . . . summary: Added support for map tracking slapp, share slapp and a voice call slapp. . . . . . . . . changeset: 16038:3c8d0aeecd9e . . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . . date: Thu Oct 21 15:57:06 2010 -0400 . . . . . . . . summary: Added support for map tracking slapp, share slapp and a voice call slapp. . . . . . . . . changeset: 16037:93f78364d59b . . . . . . . . parent: 16035:4f255ba1cfa4 . . . . . . . . user: prep linden <prep@lindenlab.com> . . . . . . . . date: Thu Oct 21 13:26:13 2010 -0400 . . . . . . . . summary: secondlife:///app/maptrackavatar/lluid . . . . . . . . changeset: 16035:4f255ba1cfa4 . . . . . . . . parent: 13903:d5f123f1f058 . . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . . date: Tue Oct 12 08:43:16 2010 -0400 . . . . . . . . summary: Initial hooks for web profiles support . . . . . . . [ default ] . . . . . . . changeset: 16043:c201cac4df01 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Fri Oct 22 11:35:58 2010 -0400 . . . . . . . summary: SOCIAL-84 FIX, SOCIAL-85 FIX - new slapps for edit classified, create and edit pick . . . . . . . changeset: 16042:f07c6b0a37d0 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Thu Oct 21 14:41:42 2010 -0400 . . . . . . . summary: support for edit classified slapp . . . . . . . changeset: 16041:33780ad3705a . . . . . . . parent: 16036:adf821756b63 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Wed Oct 20 17:03:36 2010 -0400 . . . . . . . summary: SOCIAL-84, SOCIAL-85 WIP . . . . . . . changeset: 16036:adf821756b63 . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . date: Mon Oct 18 18:11:29 2010 -0400 . . . . . . . summary: consolidate generating profile URL, force to lower case . . . . . . [ default ] . . . . . . changeset: 16028:cf09cfdae607 . . . . . . parent: 16023:6d44f0d85a80 . . . . . . user: David Kaprielian <sabin@lindenlab.com> . . . . . . date: Thu Jan 06 13:08:00 2011 -0800 . . . . . . summary: Syncing coverity build.sh code with trunk. . . . . . [ default ] . . . . . changeset: 16074:b7544fffb90c . . . . . user: Andrew Productengine <adyukov@productengine.com> . . . . . date: Thu Dec 23 18:15:54 2010 +0200 . . . . . summary: STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference instead of per-machine. . . . . . changeset: 16073:9592b6bae4b9 . . . . . user: Andrew Productengine <adyukov@productengine.com> . . . . . date: Thu Dec 09 19:54:40 2010 +0200 . . . . . summary: STORM-34 ADDITIONAL_FIX Implemented storing of multi-user favorites and showing them on login screen. . . . . . changeset: 16072:da9ee8dd69bc . . . . . parent: 15360:e843e274fa58 . . . . . user: Andrew Productengine <adyukov@productengine.com> . . . . . date: Mon Dec 06 18:05:44 2010 +0200 . . . . . summary: STORM-34 FIXED Saving of user's favorites into file and showing them in "Start at" combobox on login screen was implemented. . . . . [ default ] . . . . changeset: 16079:512e5384fa9c . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Fri Jan 07 11:26:16 2011 -0500 . . . . summary: STORM-826: fix line endings and mixed tabs/spaces . . . . changeset: 16078:f9c733dff822 . . . . parent: 16062:3a6baa028c7c . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Thu Jan 06 11:06:20 2011 -0500 . . . . summary: STORM-826 (workaround): correct mixed and dos-style line endings . . . [ default ] . . . changeset: 16081:93874c3d90fd . . . parent: 16077:78fae8ca1b36 . . . user: Coaldust Numbers . . . date: Fri Jan 07 15:08:42 2011 -0500 . . . summary: VWR-1095 fix for problems with uploads following bulk upload failure . . [ default ] . . changeset: 16071:3b01f78964ba . . parent: 16070:a7ea01f7eda4 . . parent: 16069:faf1ba48afe3 . . user: Loren Shih <seraph@lindenlab.com> . . date: Mon Jan 10 11:20:28 2011 -0500 . . summary: Automated merge from mesh-development . . . [ default ] . . . changeset: 16069:faf1ba48afe3 . . . user: prep linden <prep@lindenlab.com> . . . date: Mon Jan 10 11:04:13 2011 -0500 . . . summary: Added support for parsing a matrix sids translation elements for joints . . . changeset: 16068:e9b137e627f7 . . . parent: 16067:bca227df4ddf . . . parent: 16066:2d077486c4db . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . date: Fri Jan 07 15:22:13 2011 -0500 . . . summary: merge . . . . [ default ] . . . . changeset: 16066:2d077486c4db . . . . parent: 16063:f0c71b991970 . . . . parent: 16065:a2bda95e8b5a . . . . user: Dave Parks <davep@lindenlab.com> . . . . date: Fri Jan 07 13:48:22 2011 -0600 . . . . summary: merge . . . . . [ default ] . . . . . changeset: 16065:a2bda95e8b5a . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . date: Fri Jan 07 13:48:02 2011 -0600 . . . . . summary: Clean up some xml errors from settings.xml . . . . . changeset: 16064:6798ca373ebc . . . . . parent: 15958:45cd2536c0b6 . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . date: Fri Jan 07 13:47:50 2011 -0600 . . . . . summary: SH-762 Forsyth style vertex buffer optimization for meshes. . . . . . changeset: 15958:45cd2536c0b6 . . . . . parent: 15953:2a98cc2309de . . . . . parent: 15957:7a15c6692110 . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . date: Wed Jan 05 01:23:37 2011 -0600 . . . . . summary: merge . . . . . . [ default ] . . . . . . changeset: 15957:7a15c6692110 . . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . . date: Wed Jan 05 01:21:04 2011 -0600 . . . . . . summary: SH-571 Fix for mesh shadows blinking on LoD switch. . . . . . . changeset: 15956:aa31a7ec9777 . . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . . date: Tue Jan 04 18:34:27 2011 -0600 . . . . . . summary: VWR-21927 Fix for water reflections causing LoD updates. . . . . . . changeset: 15955:be8988f52ae6 . . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . . date: Fri Dec 31 18:41:54 2010 -0600 . . . . . . summary: Faster occlusion queries (take advantage of GL_ARB_occlusion_query2 where available and don't read back result if it will block). . . . . . . changeset: 15954:f4e4365002f3 . . . . . . parent: 15939:8fe71853c7c1 . . . . . . user: Dave Parks <davep@lindenlab.com> . . . . . . date: Fri Dec 31 16:48:50 2010 -0600 . . . . . . summary: SH-727 Working cancel button and cancel buttons for physics decomp stages. . . . . . [ default ] . . . . . changeset: 15953:2a98cc2309de . . . . . user: Xiaohong Bao <bao@lindenlab.com> . . . . . date: Tue Jan 04 17:51:58 2011 -0700 . . . . . summary: trival: fix compiling errors for Linux. . . . . . changeset: 15952:ab8224ca22bc . . . . . parent: 15949:488c8f24420c . . . . . parent: 15951:e4dded885f99 . . . . . user: Xiaohong Bao <bao@lindenlab.com> . . . . . date: Tue Jan 04 16:50:42 2011 -0700 . . . . . summary: Automated merge with http://hg.secondlife.com/mesh-development . . . . . . [ default ] . . . . . . changeset: 15951:e4dded885f99 . . . . . . user: Xiaohong Bao <bao@lindenlab.com> . . . . . . date: Tue Jan 04 16:28:40 2011 -0700 . . . . . . summary: a debug tool to detect LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist. . . . . . . changeset: 15950:ebfb52e75bd8 . . . . . . parent: 15936:57a94c86cfc5 . . . . . . user: Xiaohong Bao <bao@lindenlab.com> . . . . . . date: Tue Jan 04 16:22:38 2011 -0700 . . . . . . summary: clear some LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist. . . . . [ default ] . . . . changeset: 16063:f0c71b991970 . . . . parent: 16027:df4acacb9f9d . . . . parent: 16062:3a6baa028c7c . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Fri Jan 07 10:14:33 2011 -0500 . . . . summary: Automated merge up from viewer-development . . . . changeset: 16027:df4acacb9f9d . . . . parent: 16026:27a26e283d6b . . . . parent: 16013:b50a9a6bde2b . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Fri Jan 07 10:14:22 2011 -0500 . . . . summary: Automated merge from mesh-development . . . . . [ default ] . . . . . changeset: 16013:b50a9a6bde2b . . . . . user: Nyx (Neal Orman) <nyx@lindenlab.com> . . . . . date: Thu Jan 06 13:07:18 2011 -0500 . . . . . summary: BUILDFIX: fixing linux build breakage . . . . . changeset: 16012:674f0202e961 . . . . . parent: 16008:c16b3d8de479 . . . . . parent: 16011:c1ac9e8007a7 . . . . . user: Nyx (Neal Orman) <nyx@lindenlab.com> . . . . . date: Thu Jan 06 11:46:03 2011 -0500 . . . . . summary: Automated merge with https://hg.secondlife.com/mesh-development . . . . . . [ default ] . . . . . . changeset: 16011:c1ac9e8007a7 . . . . . . parent: 15948:67a8ded01824 . . . . . . parent: 16010:852c66d6fd83 . . . . . . user: Nyx (Neal Orman) <nyx@lindenlab.com> . . . . . . date: Tue Jan 04 13:11:34 2011 -0500 . . . . . . summary: Automated merge with https://hg.secondlife.com/mesh-development . . . . . . . [ default ] . . . . . . . changeset: 16010:852c66d6fd83 . . . . . . . parent: 15937:dce53d8a9fff . . . . . . . parent: 16009:6dd0ec24e84b . . . . . . . user: Nyx (Neal Orman) <nyx@lindenlab.com> . . . . . . . date: Thu Dec 30 11:56:59 2010 -0500 . . . . . . . summary: Automated merge with https://hg.secondlife.com/mesh-development . . . . . . . . [ default ] . . . . . . . . changeset: 16009:6dd0ec24e84b . . . . . . . . parent: 15731:3354affd300c . . . . . . . . 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: ???:f4110de7b7c4 . . . . . [ default ] . . . . . changeset: 16008:c16b3d8de479 . . . . . parent: 16007:7a9b6f9c040d . . . . . parent: 16006:ca556f2d4e63 . . . . . user: prep <prep@lindenlab.com> . . . . . date: Wed Jan 05 16:12:15 2011 -0500 . . . . . summary: merge . . . . . . [ default ] . . . . . . changeset: 16006:ca556f2d4e63 . . . . . . parent: 15981:0d78d2b24c8d . . . . . . parent: 16005:845cab866155 . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Wed Jan 05 15:10:39 2011 -0500 . . . . . . summary: Automated merge up from viewer-development . . . . . . changeset: 15981:0d78d2b24c8d . . . . . . parent: 15980:4605f186c720 . . . . . . parent: 15965:c19fc749244f . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Wed Jan 05 15:10:31 2011 -0500 . . . . . . summary: Automated merge from mesh-development . . . . . . . [ default ] . . . . . . . changeset: 15965:c19fc749244f . . . . . . . parent: 15964:4905d333ef4b . . . . . . . parent: 15963:818a6121c25e . . . . . . . user: prep <prep@lindenlab.com> . . . . . . . date: Wed Jan 05 14:10:18 2011 -0500 . . . . . . . summary: merge . . . . . . . . [ default ] . . . . . . . . changeset: 15963:818a6121c25e . . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . . date: Wed Jan 05 10:37:28 2011 -0500 . . . . . . . . summary: fixed line endings again . . . . . . . . changeset: 15962:9dd52b4508d1 . . . . . . . . parent: 15961:231925bcbd87 . . . . . . . . parent: 15958:45cd2536c0b6 . . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . . date: Wed Jan 05 10:37:00 2011 -0500 . . . . . . . . summary: merge . . . . . . . . changeset: 15961:231925bcbd87 . . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . . date: Thu Dec 30 14:53:54 2010 -0500 . . . . . . . . summary: line endings broken again . . . . . . . . changeset: 15960:e54587aa19f4 . . . . . . . . parent: 15959:cafd2d86c53c . . . . . . . . parent: 15731:3354affd300c . . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . . date: Wed Dec 29 14:08:47 2010 -0500 . . . . . . . . summary: merge . . . . . . . . changeset: 15959:cafd2d86c53c . . . . . . . . parent: 15659:03a7efaa29e0 . . . . . . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . . . . . . date: Wed Dec 29 10:03:33 2010 -0500 . . . . . . . . summary: allow run-time query of which timer function is being used . . . . . . . [ default ] . . . . . . . changeset: 15964:4905d333ef4b . . . . . . . parent: 15958:45cd2536c0b6 . . . . . . . user: prep <prep@lindenlab.com> . . . . . . . date: Wed Jan 05 14:09:19 2011 -0500 . . . . . . . summary: patch for gl_any_samples_passed missing define on mac . . . . . . [ default ] . . . . . . changeset: 15980:4605f186c720 . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Wed Jan 05 15:08:50 2011 -0500 . . . . . . summary: SH-741 FIXED Mesh assets cannot be dragged into notecards . . . . . . changeset: 15979:eeffd1a2c27c . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Tue Jan 04 18:41:36 2011 -0500 . . . . . . summary: SH-739 Meshes can no longer be moved into subfolders of the "Meshes" folder . . . . . . changeset: 15978:2e02209d78c5 . . . . . . parent: 15977:91d3e358e751 . . . . . . parent: 15949:488c8f24420c . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Tue Jan 04 17:24:06 2011 -0500 . . . . . . summary: Automated merge from mesh-development . . . . . . changeset: 15977:91d3e358e751 . . . . . . parent: 15976:b777964510c2 . . . . . . parent: 15948:67a8ded01824 . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Tue Jan 04 11:00:14 2011 -0500 . . . . . . summary: Automated merge from mesh-development . . . . . . changeset: 15976:b777964510c2 . . . . . . parent: 15937:dce53d8a9fff . . . . . . parent: 15975:b0bd26c5638a . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . date: Thu Dec 30 16:30:36 2010 -0500 . . . . . . summary: Automated merge up from viewer-development . . . . . [ default ] . . . . . changeset: 16007:7a9b6f9c040d . . . . . parent: 15965:c19fc749244f . . . . . user: prep <prep@lindenlab.com> . . . . . date: Wed Jan 05 16:07:16 2011 -0500 . . . . . summary: Fix for SH-579 . . . . [ default ] . . . . changeset: 16026:27a26e283d6b . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Thu Jan 06 18:00:08 2011 -0500 . . . . summary: SH-700 FIXED Minor UI layout issue in Physics tab in Upload Model dialog . . . . changeset: 16025:8021943764c4 . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Thu Jan 06 15:25:55 2011 -0500 . . . . summary: SH-705 FIXED LOD layers error message is truncated . . . . changeset: 16024:ed6dc5f132c7 . . . . parent: 16015:0286232eb7ce . . . . parent: 16023:6d44f0d85a80 . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Thu Jan 06 11:06:09 2011 -0500 . . . . summary: Automated merge up from viewer-development . . . . changeset: 16015:0286232eb7ce . . . . parent: 16014:a60a6ae49b22 . . . . parent: 16008:c16b3d8de479 . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Thu Jan 06 11:01:17 2011 -0500 . . . . summary: Automated merge from mesh-development . . . . changeset: 16014:a60a6ae49b22 . . . . parent: 16006:ca556f2d4e63 . . . . user: Loren Shih <seraph@lindenlab.com> . . . . date: Thu Jan 06 10:59:46 2011 -0500 . . . . summary: SH-690 FIXED Name field in Upload Model dialog allows unicode charaters to be entered which shows a blank name in inventory once uploaded . . . [ default ] . . . changeset: 16067:bca227df4ddf . . . parent: 16013:b50a9a6bde2b . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . date: Fri Jan 07 15:20:48 2011 -0500 . . . summary: expose << operator for LLMD5 objects in LL_COMMON_API . . [ default ] . . changeset: 16070:a7ea01f7eda4 . . parent: 16063:f0c71b991970 . . user: Loren Shih <seraph@lindenlab.com> . . date: Fri Jan 07 17:16:28 2011 -0500 . . summary: SH-759 FIXED Various crashes in model floater after you open file picker then cancel . [ default ] . changeset: 16085:6fbe52ae3309 . parent: 16084:49afed690400 . parent: 16013:b50a9a6bde2b . user: leyla_linden . date: Thu Jan 06 16:43:57 2011 -0800 . summary: Merge . changeset: 16084:49afed690400 . parent: 15949:488c8f24420c . user: leyla_linden . date: Thu Jan 06 16:42:18 2011 -0800 . summary: added callback for updating wizard dimensions and costs from the model preview