Ignored revisions: 12346 Ignoring 2374 ancestors included in old builds. included in: 220166 changeset: 14754:7d7b01ef8271 tag: tip parent: 14752:6fc2fc82c6e9 parent: 14753:42085851086f user: Merov Linden date: Tue Feb 01 16:22:43 2011 -0800 summary: STORM-397 : pull for testing included in: 220166 changeset: 14753:42085851086f parent: 14667:26c09ad4293e user: Seth ProductEngine 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. included in: 220166 changeset: 14752:6fc2fc82c6e9 parent: 14750:a0cebbd8e00f parent: 14751:42cef2cc4ec3 user: Merov Linden date: Tue Feb 01 16:19:54 2011 -0800 summary: STORM-219 : pull for testing included in: 220166 changeset: 14751:42cef2cc4ec3 parent: 14717:691e3941d950 user: Seth ProductEngine date: Fri Jan 28 21:38:58 2011 +0200 summary: STORM-316 FIXED Added "Sort Folders Always by Name" setting. included in: 220166 changeset: 14750:a0cebbd8e00f parent: 14748:bbf6efe26a04 parent: 14749:7990f73bcfb9 user: Merov Linden date: Tue Feb 01 16:16:42 2011 -0800 summary: STORM-507 : pull for testing included in: 220166 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 included in: 220166 changeset: 14748:bbf6efe26a04 parent: 14746:5d358223c3b2 parent: 14747:e82c7bc95fba user: Merov Linden date: Tue Feb 01 16:15:05 2011 -0800 summary: STORM-610 : pull for testing included in: 220166 changeset: 14747:e82c7bc95fba parent: 14682:b542f8134a2b user: Vadim ProductEngine 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. included in: 220166 changeset: 14746:5d358223c3b2 parent: 14744:a0ff0bd22c6e parent: 14745:57d6a2cbaedf user: Merov Linden date: Tue Feb 01 16:13:11 2011 -0800 summary: STORM-513 : pull for testing included in: 220166 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 included in: 220166 changeset: 14744:a0ff0bd22c6e parent: 14742:a2eb46930129 parent: 14743:78514d4a7df8 user: Merov Linden date: Tue Feb 01 15:58:53 2011 -0800 summary: STORM-655 : pull for testing included in: 220166 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) codeticket: 220115 included in: 220166 changeset: 14737:33fc9ed99d29 parent: 14736:e94c02901c75 parent: 14724:b575bde7d5e8 user: Oz Linden date: Tue Feb 01 07:22:32 2011 -0500 summary: merge changes back from beta branch codeticket: 220029 included in: 220115 changeset: 14724:b575bde7d5e8 parent: 14723:b5c3758a8079 parent: 14722:127f6fc35c12 user: Oz Linden date: Mon Jan 31 12:34:17 2011 -0500 summary: merge changes for storm-845 included in: 220029 changeset: 14722:127f6fc35c12 parent: 14529:45640415ef0d parent: 14721:80c054b156c8 user: Oz Linden date: Mon Jan 31 12:32:57 2011 -0500 summary: merge changes for storm-829 codeticket: 220162 included in: 220029 changeset: 14721:80c054b156c8 parent: 14720:6f044de78d1d parent: 14719:41771155b350 user: Oz Linden date: Mon Jan 31 12:26:23 2011 -0500 summary: merge changes for storm-643 included in: 220029 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 codeticket: 220094 included in: 220115 changeset: 14736:e94c02901c75 parent: 14735:f904ee733e5f parent: 14734:603fb12649f3 user: Kent Quirk date: Mon Jan 31 19:29:18 2011 -0500 summary: Merge codeticket: 220033 included in: 220094 changeset: 14734:603fb12649f3 parent: 14733:269fafd3fb88 parent: 14731:43f9b2d10aa3 user: Oz Linden date: Mon Jan 31 13:04:57 2011 -0500 summary: merge changes for storm-934 included in: 220033 changeset: 14731:43f9b2d10aa3 parent: 14730:5dd42f6d8af6 parent: 14708:1237987d1af9 user: Oz Linden date: Mon Jan 31 12:46:58 2011 -0500 summary: pull changes for STORM-940 and CHOP-369 codeticket: 219828 included in: 220033 changeset: 14730:5dd42f6d8af6 user: Andrew A. de Laix date: Thu Jan 27 11:37:59 2011 -0800 summary: STORM-940: use the tip, not the dialog. included in: 219828 changeset: 14729:0a2ebeadc2f5 user: Andrew A. de Laix date: Thu Jan 27 11:37:00 2011 -0800 summary: more for storm 940: treat the manditory download after login like an optional one. included in: 219828 changeset: 14728:04e9ada52f11 parent: 14727:f45bf13b0c5f parent: 14650:b1ba2bd8309f user: Andrew A. de Laix date: Wed Jan 26 16:31:39 2011 -0800 summary: merge from lindenlab/viewer-beta included in: 219828 changeset: 14727:f45bf13b0c5f user: Andrew A. de Laix date: Wed Jan 26 16:31:15 2011 -0800 summary: fix for STORM-940: don't show manditory update dialog if already logged in. codeticket: 219560 included in: 219828 changeset: 14726:a531fa1abe74 user: Andrew A. de Laix date: Mon Jan 24 14:58:10 2011 -0800 summary: a less brain dead fix for CHOP-369 codeticket: 219496 included in: 219560 changeset: 14725:b2304fc8e9f6 parent: 14620:54d772d8687c user: Andrew A. de Laix date: Mon Jan 24 10:54:08 2011 -0800 summary: fix CHOP-369: catch case of synchronous download failure. included in: 220033 changeset: 14733:269fafd3fb88 parent: 14732:9fb7940a8e61 parent: 14708:1237987d1af9 user: callum date: Fri Jan 28 15:59:19 2011 -0800 summary: Merge with head included in: 220033 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] included in: 220094 changeset: 14735:f904ee733e5f parent: 14708:1237987d1af9 user: Kent Quirk date: Mon Jan 31 19:18:58 2011 -0500 summary: VWR-22024 -- apply Bao's patch to beta included in: 220166 changeset: 14742:a2eb46930129 parent: 14685:d74f1fbb58ed parent: 14741:0ebf060ac6c3 user: Merov Linden date: Tue Feb 01 15:52:50 2011 -0800 summary: Pull from viewer-development codeticket: 220134 included in: 220166 changeset: 14741:0ebf060ac6c3 parent: 14737:33fc9ed99d29 parent: 14740:1e7bc2d6751a user: Dave Parks date: Tue Feb 01 15:35:56 2011 -0600 summary: merge included in: 220134 changeset: 14740:1e7bc2d6751a parent: 14724:b575bde7d5e8 parent: 14739:134ffcddbb30 user: Dave Parks date: Tue Feb 01 02:06:53 2011 -0600 summary: merge included in: 220134 changeset: 14739:134ffcddbb30 user: Dave Parks 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. included in: 220134 changeset: 14738:387e20bdced8 parent: 14668:38ed1abd9cd9 user: Dave Parks date: Wed Jan 26 17:06:35 2011 -0600 summary: SH-469 Stop using framebuffer objects for hi-res snapshots. codeticket: 219973 included in: 220166 changeset: 14685:d74f1fbb58ed parent: 14683:284f9f9eeeab parent: 14684:978f149eb7cf user: Merov Linden date: Fri Jan 28 16:02:06 2011 -0800 summary: STORM-937 : Pull for testing