completed: Wed Jan 12 18:27:26 2011
. [ default ] . changeset: 14530:cebb9afcacec . tag: tip . parent: 14528:be666dad26e3 . parent: 14529:45640415ef0d . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:33:57 2011 -0800 . summary: STORM-829 : pull in for testing . . [ default ] . . changeset: 14529:45640415ef0d . . parent: 14433:3d755de28394 . . 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 . . changeset: 14433: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: 14432:be51a3e9c341 . . parent: 14431:384bbeba94ba . . parent: 14430:845cab866155 . . user: Loren Shih <seraph@lindenlab.com> . . date: Wed Jan 05 16:35:09 2011 -0500 . . summary: Automated merge from viewer-development . . . [ default ] . . . changeset: 14430:845cab866155 . . . parent: 14372:79cd488e495f . . . parent: 14429:d82b031e4835 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Tue Jan 04 16:46:09 2011 -0500 . . . summary: merge changes for storm-398 . . . . [ default ] . . . . changeset: 14429:d82b031e4835 . . . . parent: 14376:2273d8a83b83 . . . . parent: 14428:9aaa1891b740 . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Tue Jan 04 16:45:08 2011 -0500 . . . . summary: merge changes for storm-467 . . . . . [ default ] . . . . . changeset: 14428:9aaa1891b740 . . . . . parent: 14378:f0a145726c6a . . . . . parent: 14427:ac9e50564f23 . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . date: Tue Jan 04 16:44:15 2011 -0500 . . . . . summary: merge changes for storm-485 . . . . . . [ default ] . . . . . . changeset: 14427:ac9e50564f23 . . . . . . parent: 14387:bd36f6fe13c6 . . . . . . parent: 14426:ffafa1ca7711 . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . date: Tue Jan 04 16:43:26 2011 -0500 . . . . . . summary: merge changes for storm-737 . . . . . . . [ default ] . . . . . . . changeset: 14426:ffafa1ca7711 . . . . . . . parent: 14425:72177a02701d . . . . . . . parent: 14424:52ba218e2c37 . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . date: Tue Jan 04 16:41:05 2011 -0500 . . . . . . . summary: merge changes for storm-466 . . . . . . . . [ default ] . . . . . . . . changeset: 14424:52ba218e2c37 . . . . . . . . parent: 14423:696053ac2dbb . . . . . . . . parent: 14422:8e98007112f1 . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . date: Tue Jan 04 16:40:25 2011 -0500 . . . . . . . . summary: merge changes for storm-513 . . . . . . . . . [ default ] . . . . . . . . . changeset: 14422:8e98007112f1 . . . . . . . . . parent: 14421:ec873482d2cc . . . . . . . . . parent: 14420:51334aca3a6c . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . date: Tue Jan 04 16:39:53 2011 -0500 . . . . . . . . . summary: merge changes for storm-493 . . . . . . . . . . [ default ] . . . . . . . . . . changeset: 14420:51334aca3a6c . . . . . . . . . . parent: 14176:5374725aeb42 . . . . . . . . . . parent: 14419:ece48e427728 . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . date: Tue Jan 04 16:37:59 2011 -0500 . . . . . . . . . . summary: merge changes for storm-669 . . . . . . . . . . . [ default ] . . . . . . . . . . . changeset: 14419:ece48e427728 . . . . . . . . . . . parent: 14417:86ead5666924 . . . . . . . . . . . parent: 14415:b0bd26c5638a . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . date: Tue Jan 04 16:37:16 2011 -0500 . . . . . . . . . . . summary: merge changes for storm-823 . . . . . . . . . . . . [ default ] . . . . . . . . . . . . changeset: 14415:b0bd26c5638a . . . . . . . . . . . . parent: 14414:40e4b7541f5a . . . . . . . . . . . . parent: 14413:27dae7b01a81 . . . . . . . . . . . . user: Loren Shih <seraph@lindenlab.com> . . . . . . . . . . . . date: Thu Dec 30 13:11:44 2010 -0500 . . . . . . . . . . . . summary: Automated merge from viewer-development . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . changeset: 14413:27dae7b01a81 . . . . . . . . . . . . . parent: 14412:e36590d7b2d8 . . . . . . . . . . . . . parent: 14405:43cf4a37774c . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . date: Wed Dec 29 15:29:58 2010 -0500 . . . . . . . . . . . . . summary: merge kdu unit tests (storm-744) . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . changeset: 14405:43cf4a37774c . . . . . . . . . . . . . . parent: 14404:16a539c23101 . . . . . . . . . . . . . . parent: 14394:07ac70f74730 . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . date: Tue Dec 28 13:21:58 2010 -0800 . . . . . . . . . . . . . . summary: STORM-242 : pull into viewer-development . . . . . . . . . . . . . . changeset: 14404:16a539c23101 . . . . . . . . . . . . . . parent: 14403:e4b05dec5526 . . . . . . . . . . . . . . parent: 14389:2904bf9dfe6d . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . date: Tue Dec 28 13:19:43 2010 -0800 . . . . . . . . . . . . . . summary: STORM-805 : pull into viewer-development . . . . . . . . . . . . . . changeset: 14403:e4b05dec5526 . . . . . . . . . . . . . . parent: 14402:940cd25d4b78 . . . . . . . . . . . . . . parent: 14381:d6c8f55b9caa . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . date: Tue Dec 28 13:15:07 2010 -0800 . . . . . . . . . . . . . . summary: STORM-682 : pull into viewer-development . . . . . . . . . . . . . . changeset: 14402:940cd25d4b78 . . . . . . . . . . . . . . parent: 14400:dd86b35bd456 . . . . . . . . . . . . . . parent: 14401:c84adddad547 . . . . . . . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . . . . . . . date: Tue Dec 28 06:58:04 2010 -0500 . . . . . . . . . . . . . . summary: Automated merge with file:///Users/oz/Work/viewer-development . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . changeset: 14401:c84adddad547 . . . . . . . . . . . . . . . parent: 14368:279f35982a1a . . . . . . . . . . . . . . . user: Robin Cornelius <robin.cornelius@gmail.com> . . . . . . . . . . . . . . . date: Mon Dec 27 12:18:19 2010 +0000 . . . . . . . . . . . . . . . summary: VWR-20879: Allow find_vc_dir() to work with VCExpress . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . changeset: 14400:dd86b35bd456 . . . . . . . . . . . . . . parent: 14368:279f35982a1a . . . . . . . . . . . . . . parent: 14399:1c0e515c6811 . . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . . date: Mon Dec 27 21:21:01 2010 -0800 . . . . . . . . . . . . . . summary: STORM-523 : pull into viewer-development . . . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . . . changeset: 14399:1c0e515c6811 . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . date: Wed Dec 08 15:41:00 2010 -0500 . . . . . . . . . . . . . . . summary: Adjusted whitespace in llscreenchannel.cpp . . . . . . . . . . . . . . . changeset: 14398:ef2a44468b11 . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . date: Fri Dec 03 17:57:46 2010 -0500 . . . . . . . . . . . . . . . summary: Found and disabled another place where hovered notifications were being handled . . . . . . . . . . . . . . . changeset: 14397:fcf1717ad44a . . . . . . . . . . . . . . . parent: 13813:bf98b026bcb1 . . . . . . . . . . . . . . . user: Jonathan Yap . . . . . . . . . . . . . . . date: Fri Dec 03 03:37:37 2010 -0500 . . . . . . . . . . . . . . . summary: Fix for OK notification being overlaid by Keep/Discard/Block notification . . . . . . . . . . . . . [ default ] . . . . . . . . . . . . . changeset: 14412: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: 14411: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: 14410:db6091fa70a4 . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . date: Tue Dec 28 15:58:37 2010 -0800 . . . . . . . . . . . . . summary: STORM-744 : Fix release building issue . . . . . . . . . . . . . changeset: 14409: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: 14408:005d5d6d0031 . . . . . . . . . . . . . parent: 14407:fdae55c3ed3b . . . . . . . . . . . . . parent: 14214:a235486a4af7 . . . . . . . . . . . . . user: Merov Linden <merov@lindenlab.com> . . . . . . . . . . . . . date: Wed Dec 22 22:32:14 2010 -0800 . . . . . . . . . . . . . summary: STORM-744 : pull from STORM-151 . . . . . . . . . . . . . changeset: 14407: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: 14406:8d17f17e224a . . . . . . . . . . . . . parent: 14213: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: 14414:40e4b7541f5a . . . . . . . . . . . . parent: 14405: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: 14417:86ead5666924 . . . . . . . . . . . parent: 14413: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: 14421:ec873482d2cc . . . . . . . . . parent: 14413: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: 14423:696053ac2dbb . . . . . . . . parent: 14413: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: 14425:72177a02701d . . . . . . . parent: 14374:6da8825bd7d0 . . . . . . . user: Jonathan Yap . . . . . . . date: Tue Dec 28 05:32:43 2010 -0500 . . . . . . . summary: STORM-466 Put Twisted Laws name into contributions.txt . . [ default ] . . changeset: 14431:384bbeba94ba . . parent: 14415: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: 14528:be666dad26e3 . parent: 14526:c941b46621ee . parent: 14527:4f12274129d7 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:31:42 2011 -0800 . summary: STORM-393 : pull in for testing . . [ default ] . . changeset: 14527:4f12274129d7 . . parent: 14433: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: 14526:c941b46621ee . parent: 14524:aee0df2a5417 . parent: 14525:295c3eef7263 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:30:23 2011 -0800 . summary: STORM-514 : pull in for testing . . [ default ] . . changeset: 14525:295c3eef7263 . . parent: 14433: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: 14524:aee0df2a5417 . parent: 14522:5f450ecdda80 . parent: 14523:15239de6c398 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:27:48 2011 -0800 . summary: STORM-435 : pull i for testing . . [ default ] . . changeset: 14523:15239de6c398 . . parent: 14473:3a6baa028c7c . . user: Jonathan Yap . . date: Fri Jan 07 13:12:39 2011 -0500 . . summary: STORM-435 There is no space between name of object and value of object in Chat step while creating new gesture . . changeset: 14473:3a6baa028c7c . . parent: 14439:cf09cfdae607 . . parent: 14472: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: 14472:7fe6d32a195c . . . parent: 14471:464450764bc3 . . . parent: 14445:eb142fb8cf23 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Thu Jan 06 19:20:54 2011 -0500 . . . summary: merge changes for web profiles . . . . [ default ] . . . . changeset: 14445:eb142fb8cf23 . . . . parent: 14444:0bf2a71b49e2 . . . . parent: 14443:649225f03511 . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Thu Jan 06 14:33:35 2011 -0500 . . . . summary: merge changes for storm-812 . . . . . [ default ] . . . . . changeset: 14443:649225f03511 . . . . . parent: 14442:925db607bf1c . . . . . parent: 14441:1adbbfe86638 . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . date: Thu Jan 06 14:32:01 2011 -0500 . . . . . summary: merge changes for storm-714 . . . . . . [ default ] . . . . . . changeset: 14441:1adbbfe86638 . . . . . . parent: 14440:f1d1b8d67c01 . . . . . . parent: 14438:6d44f0d85a80 . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . date: Thu Jan 06 14:31:17 2011 -0500 . . . . . . summary: merge changes for storm-438 . . . . . . . [ default ] . . . . . . . changeset: 14438:6d44f0d85a80 . . . . . . . parent: 14437:3495df7155d2 . . . . . . . parent: 14436:a929cba7198b . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . date: Wed Jan 05 17:54:12 2011 -0500 . . . . . . . summary: merge changes for storm-806 . . . . . . . . [ default ] . . . . . . . . changeset: 14436:a929cba7198b . . . . . . . . parent: 14435:25659da27b00 . . . . . . . . parent: 14433:3d755de28394 . . . . . . . . user: Oz Linden <oz@lindenlab.com> . . . . . . . . date: Wed Jan 05 17:53:37 2011 -0500 . . . . . . . . summary: merge changes for storm-825 . . . . . . . . changeset: 14435:25659da27b00 . . . . . . . . parent: 14434:e441dac81c5d . . . . . . . . parent: 14415: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: 14434:e441dac81c5d . . . . . . . . parent: 14405: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: 14437:3495df7155d2 . . . . . . . parent: 14215: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: 14440:f1d1b8d67c01 . . . . . . parent: 14355: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: 14442:925db607bf1c . . . . . parent: 14402: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: 14444:0bf2a71b49e2 . . . . parent: 14355: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: 14471: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: 14470: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: 14469:e3dd2e9b5bd2 . . . parent: 14468:d4e06124b6f3 . . . parent: 14438: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: 14468:d4e06124b6f3 . . . parent: 14467:c54ec20be65a . . . parent: 14433:3d755de28394 . . . user: callum . . . date: Wed Jan 05 15:52:43 2011 -0800 . . . summary: Merge with viewer-development . . . changeset: 14467:c54ec20be65a . . . user: callum . . . date: Wed Jan 05 15:49:57 2011 -0800 . . . summary: SOCIAL-304 FIX Modify side panel to reflect Profiles changes . . . changeset: 14466: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: 14465:e026bd9cc0a7 . . . user: callum . . . date: Wed Dec 29 13:36:34 2010 -0800 . . . summary: SOCIAL-403 FIX Update button graphic that opens Web profiles . . . changeset: 14464: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: 14463:1c5d8d64ee4f . . . parent: 14462:9bdb34108dc5 . . . parent: 14354:5d69e36a53ee . . . user: callum . . . date: Wed Dec 22 15:22:43 2010 -0800 . . . summary: Merge with tip of viewer-development . . . changeset: 14462:9bdb34108dc5 . . . user: prep <prep@lindenlab.com> . . . date: Thu Dec 09 12:59:27 2010 -0500 . . . summary: Social-166 . . . changeset: 14461: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: 14460:f94cb6b80233 . . . parent: 14459:1b19471dbac0 . . . parent: 13876: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: 14459: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: 14458:78ee3ef9351c . . . user: prep linden <prep@lindenlab.com> . . . date: Thu Nov 18 16:22:25 2010 -0500 . . . summary: misc cleanup . . . changeset: 14457:eb063809050d . . . user: prep linden <prep@lindenlab.com> . . . date: Thu Nov 18 16:14:20 2010 -0500 . . . summary: XML fixup . . . changeset: 14456: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: 14455:ac8fc19d3f7b . . . parent: 14454:c201cac4df01 . . . parent: 14451:586ab2453093 . . . user: Brad Payne (Vir Linden) <vir@lindenlab.com> . . . date: Fri Oct 22 11:37:20 2010 -0400 . . . summary: merge . . . . [ default ] . . . . changeset: 14451: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: 14450: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: 14449: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: 14448:93f78364d59b . . . . parent: 14446:4f255ba1cfa4 . . . . user: prep linden <prep@lindenlab.com> . . . . date: Thu Oct 21 13:26:13 2010 -0400 . . . . summary: secondlife:///app/maptrackavatar/lluid . . . . changeset: 14446:4f255ba1cfa4 . . . . parent: 12606: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: 14454: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: 14453: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: 14452:33780ad3705a . . . parent: 14447: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: 14447: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: 14439:cf09cfdae607 . . 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: 14522:5f450ecdda80 . parent: 14520:c6ee3ccf4dfd . parent: 14521:af54c54ada75 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:24:58 2011 -0800 . summary: STORM-702 : pull in for testing . . [ default ] . . changeset: 14521:af54c54ada75 . . parent: 14415: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: 14520:c6ee3ccf4dfd . parent: 14518:063bb89005f1 . parent: 14519:5c9989624a1e . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:23:25 2011 -0800 . summary: STORM-383 : pull in for testing . . [ default ] . . changeset: 14519:5c9989624a1e . . parent: 14438: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: 14518:063bb89005f1 . parent: 14516:a00f8b60f9c7 . parent: 14517:bc1c7580c8b4 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:21:50 2011 -0800 . summary: STORM-370 : pull in for testing . . [ default ] . . changeset: 14517:bc1c7580c8b4 . . parent: 14481: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 . . changeset: 14481:bceb13778d1d . . parent: 14480:93874c3d90fd . . parent: 14479:ee57e4400313 . . user: Oz Linden <oz@lindenlab.com> . . date: Fri Jan 07 16:45:04 2011 -0500 . . summary: merge changes for vwr-1095 . . . [ default ] . . . changeset: 14479:ee57e4400313 . . . parent: 14478:512e5384fa9c . . . parent: 14476:78fae8ca1b36 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Fri Jan 07 16:44:38 2011 -0500 . . . summary: merge changes for storm-826 . . . . [ default ] . . . . changeset: 14476: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: 14475: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: 14474:a82e5b1e22c7 . . . . tag: 2.5.0-start . . . . parent: 14352:b7544fffb90c . . . . parent: 14473:3a6baa028c7c . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Fri Jan 07 10:39:05 2011 -0500 . . . . summary: merge changes for storm-34 . . . [ default ] . . . changeset: 14478: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: 14477:f9c733dff822 . . . parent: 14473: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: 14480:93874c3d90fd . . parent: 14476: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: 14516:a00f8b60f9c7 . parent: 14513:fc8332ee9230 . parent: 14515:c2f48c6b37c4 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:20:40 2011 -0800 . summary: STORM-830 : pull in for testing . . [ default ] . . changeset: 14515: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: 14514:9a2bce01b0ce . . parent: 14438: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: 14513:fc8332ee9230 . parent: 14510:685f8787c5ce . parent: 14512:222ebe6524df . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:19:21 2011 -0800 . summary: STORM-720 : pull in for testing . . [ default ] . . changeset: 14512: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: 14511:1b5275d6c281 . . parent: 14481: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: 14510:685f8787c5ce . parent: 14508:a9d65b47ba90 . parent: 14509:fc7e5dcf3059 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:17:13 2011 -0800 . summary: STORM-797 : pull in for testing . . [ default ] . . changeset: 14509:fc7e5dcf3059 . . parent: 14481: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: 14508:a9d65b47ba90 . parent: 14418:335af5aa98c3 . parent: 14507:0ba171198594 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 11:04:06 2011 -0800 . summary: pull fro viewer-development . . [ default ] . . changeset: 14507:0ba171198594 . . parent: 14483:409e527b267c . . parent: 14506: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: 14506: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: 14505:94cd40084e39 . . . parent: 14504:a6dc92b40f43 . . . parent: 14502:91572fa89a95 . . . user: Andrew Meadows <andrew@lindenlab.com> . . . date: Fri Jan 07 15:22:33 2011 -0800 . . . summary: merge . . . . [ default ] . . . . changeset: 14502:91572fa89a95 . . . . parent: 14501:f8c793d4214b . . . . parent: 14405:43cf4a37774c . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . date: Wed Dec 29 12:39:58 2010 -0800 . . . . summary: merge . . . . changeset: 14501:f8c793d4214b . . . . parent: 14500:a4b0f72a8428 . . . . parent: 14499:ba6d29a97383 . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . date: Wed Dec 29 11:56:28 2010 -0800 . . . . summary: merge . . . . . [ default ] . . . . . changeset: 14499: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: 14498:62a49ded5d10 . . . . . parent: 14497:957a5a86fc7d . . . . . parent: 14496:356463c07f65 . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . date: Wed Dec 22 10:28:16 2010 -0800 . . . . . summary: merge . . . . . . [ default ] . . . . . . changeset: 14496:356463c07f65 . . . . . . parent: 14495:ba91fa7a08dc . . . . . . parent: 14215:fc82190a3f0c . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Wed Dec 22 09:54:45 2010 -0800 . . . . . . summary: merge . . . . . . changeset: 14495: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: 14494: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: 14493: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: 14492:7fdc0b9843a7 . . . . . . parent: 14491:c502fc0874b3 . . . . . . parent: 14489:9dfbf1158ef7 . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Wed Dec 15 08:05:51 2010 -0800 . . . . . . summary: Another merge . . . . . . . [ default ] . . . . . . . changeset: 14489: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: 14488:24b93568da3c . . . . . . . parent: 14486:2d93cb1fb361 . . . . . . . parent: 13750:24ff7db40509 . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . date: Fri Dec 10 10:40:38 2010 -0800 . . . . . . . summary: merge . . . . . . . changeset: 14486: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: 14485: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: 14484:3f36cc8e1743 . . . . . . . parent: 13517:03e89ba6cd9f . . . . . . . parent: 13499:7ed69ee6377d . . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . . date: Tue Nov 16 07:01:11 2010 -0800 . . . . . . . summary: merge . . . . . . [ default ] . . . . . . changeset: 14491:c502fc0874b3 . . . . . . parent: 14490:71f6586b0c18 . . . . . . parent: 14487:fbfc8c5a50ab . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Wed Dec 15 08:03:49 2010 -0800 . . . . . . summary: merge . . . . . . . [ default ] . . . . . . . changeset: 14487: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: 14490:71f6586b0c18 . . . . . . parent: 14488: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: 14497:957a5a86fc7d . . . . . parent: 14215: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: 14500:a4b0f72a8428 . . . . parent: 14495:ba91fa7a08dc . . . . parent: 14215:fc82190a3f0c . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . date: Wed Dec 22 09:36:12 2010 -0800 . . . . summary: merge . . . [ default ] . . . changeset: 14504:a6dc92b40f43 . . . parent: 14503:f3ff2aab7984 . . . parent: 14476:78fae8ca1b36 . . . user: Andrew Meadows <andrew@lindenlab.com> . . . date: Fri Jan 07 15:22:22 2011 -0800 . . . summary: merge . . . changeset: 14503:f3ff2aab7984 . . . parent: 14488:24b93568da3c . . . parent: 14487: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: 14483:409e527b267c . . parent: 14481:bceb13778d1d . . parent: 14482:76f586a8e22b . . user: Merov Linden <merov@lindenlab.com> . . date: Mon Jan 10 15:10:11 2011 -0800 . . summary: pull from viewer-beta . . . [ default ] . . . changeset: 14482:76f586a8e22b . . . parent: 14475:6ba181f44396 . . . user: callum . . . date: Mon Jan 10 10:32:36 2011 -0800 . . . summary: SOCIAL-437 FIX Viewer crashes opening My Profile panel . [ default ] . changeset: 14418:335af5aa98c3 . parent: 14416:5c2d566ecea7 . parent: 14417:86ead5666924 . user: Merov Linden <merov@lindenlab.com> . date: Mon Jan 03 15:57:06 2011 -0800 . summary: STORM-823 : pull for testing . changeset: 14416:5c2d566ecea7 . parent: 14396:68771e6f90a1 . parent: 14415:b0bd26c5638a . user: Merov Linden <merov@lindenlab.com> . date: Mon Jan 03 15:55:44 2011 -0800 . summary: Pull from viewer-development