completed: Wed Feb 02 02:30:43 2011
. [ default ] . changeset: 14754:7d7b01ef8271 . tag: tip . parent: 14752:6fc2fc82c6e9 . parent: 14753:42085851086f . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 16:22:43 2011 -0800 . summary: STORM-397 : pull for testing . . [ default ] . . changeset: 14753:42085851086f . . parent: 14667:26c09ad4293e . . user: Seth ProductEngine <slitovchuk@productengine.com> . . date: Tue Jan 25 21:10:00 2011 +0200 . . summary: STORM-397 FIXED Disabled dropping wearables from a notecard to COF and any outfit folder. . [ default ] . changeset: 14752:6fc2fc82c6e9 . parent: 14750:a0cebbd8e00f . parent: 14751:42cef2cc4ec3 . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 16:19:54 2011 -0800 . summary: STORM-219 : pull for testing . . [ default ] . . changeset: 14751:42cef2cc4ec3 . . parent: 14717:691e3941d950 . . user: Seth ProductEngine <slitovchuk@productengine.com> . . date: Fri Jan 28 21:38:58 2011 +0200 . . summary: STORM-316 FIXED Added "Sort Folders Always by Name" setting. . [ default ] . changeset: 14750:a0cebbd8e00f . parent: 14748:bbf6efe26a04 . parent: 14749:7990f73bcfb9 . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 16:16:42 2011 -0800 . summary: STORM-507 : pull for testing . . [ default ] . . changeset: 14749:7990f73bcfb9 . . parent: 14717:691e3941d950 . . user: paul_productengine . . date: Mon Jan 31 19:47:50 2011 +0200 . . summary: STORM-507 FIXED User that has sent p2p call invitation to other user, is not added to Recent tab . [ default ] . changeset: 14748:bbf6efe26a04 . parent: 14746:5d358223c3b2 . parent: 14747:e82c7bc95fba . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 16:15:05 2011 -0800 . summary: STORM-610 : pull for testing . . [ default ] . . changeset: 14747:e82c7bc95fba . . parent: 14682:b542f8134a2b . . user: Vadim ProductEngine <vsavchuk@productengine.com> . . date: Fri Jan 28 16:04:32 2011 +0200 . . summary: STORM-610 FIXED Changes to water color and density in the Environment Editor now persist between sessions. . [ default ] . changeset: 14746:5d358223c3b2 . parent: 14744:a0ff0bd22c6e . parent: 14745:57d6a2cbaedf . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 16:13:11 2011 -0800 . summary: STORM-513 : pull for testing . . [ default ] . . changeset: 14745:57d6a2cbaedf . . parent: 14669:6094386369a0 . . user: paul_productengine . . date: Thu Jan 27 18:03:00 2011 +0200 . . summary: STORM-513 FIXED "Allow media to auto - play" check-box is enable after Media check-box was unchecked . [ default ] . changeset: 14744:a0ff0bd22c6e . parent: 14742:a2eb46930129 . parent: 14743:78514d4a7df8 . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 15:58:53 2011 -0800 . summary: STORM-655 : pull for testing . . [ default ] . . changeset: 14743:78514d4a7df8 . . parent: 14737:33fc9ed99d29 . . user: paul_productengine . . date: Tue Feb 01 18:39:24 2011 +0200 . . summary: STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg) . . changeset: 14737:33fc9ed99d29 . . parent: 14736:e94c02901c75 . . parent: 14724:b575bde7d5e8 . . user: Oz Linden <oz@lindenlab.com> . . date: Tue Feb 01 07:22:32 2011 -0500 . . summary: merge changes back from beta branch . . . [ default ] . . . changeset: 14724:b575bde7d5e8 . . . parent: 14723:b5c3758a8079 . . . parent: 14722:127f6fc35c12 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Mon Jan 31 12:34:17 2011 -0500 . . . summary: merge changes for storm-845 . . . . [ default ] . . . . changeset: 14722:127f6fc35c12 . . . . parent: 14529:45640415ef0d . . . . parent: 14721:80c054b156c8 . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Mon Jan 31 12:32:57 2011 -0500 . . . . summary: merge changes for storm-829 . . . . 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 . . . [ default ] . . . changeset: 14723:b5c3758a8079 . . . parent: 14644:e3e61681fbd2 . . . user: Jonathan Yap . . . date: Mon Jan 24 16:22:03 2011 -0500 . . . summary: STORM-845 Icon for nearby chat and nearby voice now is a down arrow when floater is open . . [ default ] . . changeset: 14736:e94c02901c75 . . parent: 14735:f904ee733e5f . . parent: 14734:603fb12649f3 . . user: Kent Quirk <q@lindenlab.com> . . date: Mon Jan 31 19:29:18 2011 -0500 . . summary: Merge . . . [ default ] . . . changeset: 14734:603fb12649f3 . . . parent: 14733:269fafd3fb88 . . . parent: 14731:43f9b2d10aa3 . . . user: Oz Linden <oz@lindenlab.com> . . . date: Mon Jan 31 13:04:57 2011 -0500 . . . summary: merge changes for storm-934 . . . . [ default ] . . . . changeset: 14731:43f9b2d10aa3 . . . . parent: 14730:5dd42f6d8af6 . . . . parent: 14708:1237987d1af9 . . . . user: Oz Linden <oz@lindenlab.com> . . . . date: Mon Jan 31 12:46:58 2011 -0500 . . . . summary: pull changes for STORM-940 and CHOP-369 . . . . changeset: 14730:5dd42f6d8af6 . . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . . date: Thu Jan 27 11:37:59 2011 -0800 . . . . summary: STORM-940: use the tip, not the dialog. . . . . changeset: 14729:0a2ebeadc2f5 . . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . . date: Thu Jan 27 11:37:00 2011 -0800 . . . . summary: more for storm 940: treat the manditory download after login like an optional one. . . . . changeset: 14728:04e9ada52f11 . . . . parent: 14727:f45bf13b0c5f . . . . parent: 14650:b1ba2bd8309f . . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . . date: Wed Jan 26 16:31:39 2011 -0800 . . . . summary: merge from lindenlab/viewer-beta . . . . changeset: 14727:f45bf13b0c5f . . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . . date: Wed Jan 26 16:31:15 2011 -0800 . . . . summary: fix for STORM-940: don't show manditory update dialog if already logged in. . . . . changeset: 14726:a531fa1abe74 . . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . . date: Mon Jan 24 14:58:10 2011 -0800 . . . . summary: a less brain dead fix for CHOP-369 . . . . changeset: 14725:b2304fc8e9f6 . . . . parent: 14620:54d772d8687c . . . . user: Andrew A. de Laix <alain@lindenlab.com> . . . . date: Mon Jan 24 10:54:08 2011 -0800 . . . . summary: fix CHOP-369: catch case of synchronous download failure. . . . [ default ] . . . changeset: 14733:269fafd3fb88 . . . parent: 14732:9fb7940a8e61 . . . parent: 14708:1237987d1af9 . . . user: callum . . . date: Fri Jan 28 15:59:19 2011 -0800 . . . summary: Merge with head . . . changeset: 14732:9fb7940a8e61 . . . parent: 14707:8760544e7449 . . . user: callum . . . date: Fri Jan 28 15:57:42 2011 -0800 . . . summary: STORM-934 POSSIBLE FIX [crashhunters] crash at [2] LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp] . . [ default ] . . changeset: 14735:f904ee733e5f . . parent: 14708:1237987d1af9 . . user: Kent Quirk <q@lindenlab.com> . . date: Mon Jan 31 19:18:58 2011 -0500 . . summary: VWR-22024 -- apply Bao's patch to beta . [ default ] . changeset: 14742:a2eb46930129 . parent: 14685:d74f1fbb58ed . parent: 14741:0ebf060ac6c3 . user: Merov Linden <merov@lindenlab.com> . date: Tue Feb 01 15:52:50 2011 -0800 . summary: Pull from viewer-development . . [ default ] . . changeset: 14741:0ebf060ac6c3 . . parent: 14737:33fc9ed99d29 . . parent: 14740:1e7bc2d6751a . . user: Dave Parks <davep@lindenlab.com> . . date: Tue Feb 01 15:35:56 2011 -0600 . . summary: merge . . . [ default ] . . . changeset: 14740:1e7bc2d6751a . . . parent: 14724:b575bde7d5e8 . . . parent: 14739:134ffcddbb30 . . . user: Dave Parks <davep@lindenlab.com> . . . date: Tue Feb 01 02:06:53 2011 -0600 . . . summary: merge . . . . [ default ] . . . . changeset: 14739:134ffcddbb30 . . . . user: Dave Parks <davep@lindenlab.com> . . . . date: Tue Feb 01 02:06:36 2011 -0600 . . . . summary: SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects. . . . . changeset: 14738:387e20bdced8 . . . . parent: 14668:38ed1abd9cd9 . . . . user: Dave Parks <davep@lindenlab.com> . . . . date: Wed Jan 26 17:06:35 2011 -0600 . . . . summary: SH-469 Stop using framebuffer objects for hi-res snapshots. . [ default ] . changeset: 14685:d74f1fbb58ed . parent: 14683:284f9f9eeeab . parent: 14684:978f149eb7cf . user: Merov Linden <merov@lindenlab.com> . date: Fri Jan 28 16:02:06 2011 -0800 . summary: STORM-937 : Pull for testing . . [ default ] . . changeset: 14684:978f149eb7cf . . parent: 14682:b542f8134a2b . . user: Merov Linden <merov@lindenlab.com> . . date: Fri Jan 28 16:00:57 2011 -0800 . . summary: STORM-937 : Makes all python paths use consistent syntax . [ default ] . changeset: 14683:284f9f9eeeab . parent: 14584:ac6d6b0e44b4 . parent: 14682:b542f8134a2b . user: Merov Linden <merov@lindenlab.com> . date: Fri Jan 28 15:59:18 2011 -0800 . summary: Pull from viewer-development . changeset: 14584:ac6d6b0e44b4 . parent: 14581:92699701798e . parent: 14583:0df611ddee2a . user: Merov Linden <merov@lindenlab.com> . date: Thu Jan 13 13:22:01 2011 -0800 . summary: STORM-863 : pull for testing . changeset: 14581:92699701798e . parent: 14530:cebb9afcacec . parent: 14580:a2229c07997c . user: Merov Linden <merov@lindenlab.com> . date: Thu Jan 13 11:42:38 2011 -0800 . summary: Merge v-d backout for testing . changeset: 14530:cebb9afcacec . 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 . 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 . 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 . 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 . [ 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 . 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 . 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 . 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 . 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 . 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 . 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 . 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 . changeset: 14396:68771e6f90a1 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 28 13:46:27 2010 -0800 . summary: STORM-825 : test that the LLMatrix3::orthogonalize test passes on all platforms, all builds on TC . changeset: 14395:ad7489ff21cf . parent: 14392:1b20aa48e96d . parent: 14394:07ac70f74730 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 28 09:09:11 2010 -0800 . summary: STORM-242 : pull fix for testing . changeset: 14392:1b20aa48e96d . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 23:28:58 2010 -0800 . summary: STORM-242 : Try to fix the TC build error (2) . changeset: 14391:3712b2e85007 . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 23:00:32 2010 -0800 . summary: STORM-242 : Try to fix the TC build error . changeset: 14390:aac3b8db4aa3 . parent: 14388:e25b6f503315 . parent: 14389:2904bf9dfe6d . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:15:18 2010 -0800 . summary: STORM-805 : pull for testing . changeset: 14388:e25b6f503315 . parent: 14382:b4914d92c920 . parent: 14387:bd36f6fe13c6 . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:13:00 2010 -0800 . summary: STORM-737 : pull for testing . changeset: 14382:b4914d92c920 . parent: 14379:e51b72e784ac . parent: 14381:d6c8f55b9caa . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:08:11 2010 -0800 . summary: STORM-682 : pull for testing . changeset: 14379:e51b72e784ac . parent: 14377:997a3b4c9593 . parent: 14378:f0a145726c6a . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:06:30 2010 -0800 . summary: STORM-485 : pull for testing . changeset: 14377:997a3b4c9593 . parent: 14375:528dfb858882 . parent: 14376:2273d8a83b83 . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:05:24 2010 -0800 . summary: STORM-467 : pull for testing . changeset: 14375:528dfb858882 . parent: 14373:4e70814cdba1 . parent: 14374:6da8825bd7d0 . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:03:40 2010 -0800 . summary: STORM-466 : pull for testing . changeset: 14373:4e70814cdba1 . parent: 14371:b4ae2f73da69 . parent: 14372:79cd488e495f . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:02:11 2010 -0800 . summary: STORM-398 : pull for testing . changeset: 14371:b4ae2f73da69 . parent: 14370:c24c061b55d3 . parent: 14369:469e4029fb3d . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 22:00:33 2010 -0800 . summary: STORM-242 : pull for testing . changeset: 14370:c24c061b55d3 . parent: 14353:2bc19f022015 . parent: 14368:279f35982a1a . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 27 21:59:32 2010 -0800 . summary: pull from viewer-development . changeset: 14353:2bc19f022015 . parent: 14351:baebd049e4d6 . parent: 14352:b7544fffb90c . user: Merov Linden <merov@lindenlab.com> . date: Thu Dec 23 16:59:03 2010 -0800 . summary: STORM-34 : merge for testing . changeset: 14351:baebd049e4d6 . parent: 14296:80e03bde80ba . parent: 14350:817cdd2e57cc . user: Merov Linden <merov@lindenlab.com> . date: Wed Dec 22 20:05:10 2010 -0800 . summary: STORM-810 : test merge of team chopper work . changeset: 14296:80e03bde80ba . parent: 14216:b73d3ed14e10 . parent: 14295:3f4c3a814136 . user: Merov Linden <merov@lindenlab.com> . date: Wed Dec 22 12:17:23 2010 -0800 . summary: STORM-808 : test webkit update integration . changeset: 14216:b73d3ed14e10 . parent: 14184:63eda5d6210f . parent: 14215:fc82190a3f0c . user: Merov Linden <merov@lindenlab.com> . date: Wed Dec 22 12:15:51 2010 -0800 . summary: pull from viewer-development . changeset: 14184:63eda5d6210f . parent: 14182:be632e38b34a . parent: 14183:a153c7c08f93 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:22:11 2010 -0800 . summary: merge for testing . changeset: 14182:be632e38b34a . parent: 14179:280538cef998 . parent: 14181:e2cfed90ab4c . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:20:22 2010 -0800 . summary: Merge for testing . changeset: 14179:280538cef998 . parent: 14177:317a83a5e0a8 . parent: 14178:1929638da67f . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:17:32 2010 -0800 . summary: Merge for testing . changeset: 14177:317a83a5e0a8 . parent: 14175:a1df3f4aed0f . parent: 14176:5374725aeb42 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:15:44 2010 -0800 . summary: Merge for testing . changeset: 14175:a1df3f4aed0f . parent: 14174:84e22329a923 . parent: 14173:1cbbbe846075 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:13:40 2010 -0800 . summary: Merge for testing . changeset: 14174:84e22329a923 . parent: 14171:3fa316a952cb . parent: 14172:66bbf5901a23 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:12:47 2010 -0800 . summary: Merge for testing . changeset: 14171:3fa316a952cb . parent: 14169:bdde45652a73 . parent: 14170:a32b90dcab53 . user: Merov Linden <merov@lindenlab.com> . date: Tue Dec 21 11:05:42 2010 -0800 . summary: STORM-785 : pull Jonathan's fix for testing . changeset: 14169:bdde45652a73 . parent: 14167:67dd18e1e5f8 . parent: 14168:2b07a882454b . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 20 13:04:10 2010 -0800 . summary: STORM-805 : pull for testing . changeset: 14167:67dd18e1e5f8 . parent: 14114:0704f9fc55fd . parent: 14166:0d2b3d8256a9 . user: Merov Linden <merov@lindenlab.com> . date: Mon Dec 20 13:03:08 2010 -0800 . summary: Pull from viewer-development . changeset: 14114:0704f9fc55fd . parent: 14112:bd476c3e19f2 . parent: 14113:7d9c354e839a . user: Merov Linden <merov@lindenlab.com> . date: Wed Dec 15 13:43:21 2010 -0800 . summary: Pull from STORM-453 for testing . changeset: 14112:bd476c3e19f2 . parent: 13880:e458467da38c . parent: 14111:22c757e8246b . user: Merov Linden <merov@lindenlab.com> . date: Wed Dec 15 13:41:44 2010 -0800 . summary: Pull from viewer-development . changeset: 13880:e458467da38c . parent: 13877:112e3c8c97fa . parent: 13879:9592b6bae4b9 . user: Merov Linden <merov@lindenlab.com> . date: Thu Dec 09 12:00:49 2010 -0800 . summary: STORM-34 : merge for testing . changeset: 13877:112e3c8c97fa . parent: 13526:cf5548ab0355 . parent: 13876:f9a293612eea . user: Merov Linden <merov@lindenlab.com> . date: Wed Dec 08 10:09:04 2010 -0800 . summary: Pull from viewer-development . changeset: 13526:cf5548ab0355 . parent: 13506:38c13b610102 . parent: 13525:533dd2ebb079 . user: Merov Linden <merov@lindenlab.com> . date: Tue Nov 16 18:08:28 2010 -0800 . summary: STORM-628 / ER-219 : merge with ambroff/viewer-development . changeset: 13506:38c13b610102 . parent: 13311:808ef61d8bb4 . parent: 13505:9677262bc1bc . user: Merov Linden <merov@lindenlab.com> . date: Tue Nov 16 16:38:22 2010 -0800 . summary: Pull from viewer-development . changeset: 13311:808ef61d8bb4 . parent: 13309:281f8c6ece60 . parent: 13310:fca48d35bd3a . user: Merov Linden <merov@lindenlab.com> . date: Wed Nov 03 09:51:05 2010 -0700 . summary: STORM-422 : merge Vadim fix for testing . changeset: 13309:281f8c6ece60 . parent: 13254:9a1035709823 . parent: 13308:23e74739c668 . user: Merov Linden <merov@lindenlab.com> . date: Wed Nov 03 09:05:51 2010 -0700 . summary: merge with viewer-development . changeset: 13254:9a1035709823 . parent: 13246:b3d8a33137d4 . parent: 13253:c330e057007c . user: Merov Linden <merov@lindenlab.com> . date: Fri Oct 29 10:50:27 2010 -0700 . summary: STORM-480 : merge . changeset: 13246:b3d8a33137d4 . parent: 13221:cc5c194d1fe9 . parent: 13245:48307c947b78 . user: Merov Linden <merov@lindenlab.com> . date: Fri Oct 29 10:25:38 2010 -0700 . summary: merge with viewer-development . changeset: 13221:cc5c194d1fe9 . parent: 13208:22cf84f4b417 . parent: 13220:4ab8edc1463c . user: Merov Linden <merov@lindenlab.com> . date: Fri Oct 29 10:24:30 2010 -0700 . summary: STORM-255 : merge for testing . changeset: 13208:22cf84f4b417 . parent: 13125:667a995a14c7 . parent: 13207:f40486111006 . user: Merov Linden <merov@lindenlab.com> . date: Wed Oct 27 09:57:12 2010 -0700 . summary: Pull from viewer-development . changeset: 13125:667a995a14c7 . user: Wolfpup Lowenhar<wolfpup67@earthlink.net> . date: Thu Sep 30 22:42:16 2010 -0400 . summary: STORM-256 Corrupted lines above mini location bar when navigation and favorites bar hidden . [ Transplant ] . changeset: ???:dbbb1f24d9ab . [ default ] . changeset: 13124:a979e38425e5 . user: Wolfpup Lowenhar<wolfpup67@earthlink.net> . date: Thu Sep 30 22:06:51 2010 -0400 . summary: STORM-256 Corrupted lines above mini location bar when navigation and favorites bar hidden . [ Transplant ] . changeset: ???:e927c2c7a6e6