Build Results from merov_viewer-development-import (220162)

completed: Wed Feb 02 01:22:27 2011

CYGWIN Installers Second_Life_2-6-0-220162_Developer_Setup.exe
Build Logs build_log.65.txt
Buildparams BuildScript.sh
Symbol Files
new location
secondlife-symbols-windows.tar.bz2
Linux Installers SecondLife-i686-2.6.0.220162.tar.bz2
Build Logs build_log.57.txt
shell-trace
Buildparams BuildScript.sh
Symbol Files
new location
secondlife-symbols-linux.tar.bz2
Darwin Installers SecondLife_2_6_0_220162_DEVELOPER.dmg
Build Logs build_log.59.txt
shell-trace
Buildparams BuildScript.sh
Symbol Files
new location
secondlife-symbols-darwin.tar.bz2
Symbol Files secondlife-symbols-darwin.tar.bz2
secondlife-symbols-linux.tar.bz2
secondlife-symbols-windows.tar.bz2
Changes since Release changes.html
Old Builds
revision changeset
219973 d74f1fbb58ed
219231 d9644fd43639
218990 ac6d6b0e44b4
218974 92699701798e
218825 cebb9afcacec
217892 68771e6f90a1
revision changeset
217883 ad7489ff21cf
217857 2bc19f022015
217816 baebd049e4d6
217815 d55e90d43d1e
217778 80e03bde80ba
217776 a235486a4af7
revision changeset
217627 63eda5d6210f
217423 bdde45652a73
217039 0704f9fc55fd
217036 dad13b61f4f8
216992 b9f75db99fce
216481 e458467da38c
 

Changes since the last good build (2011-01-29T01:59:16.000Z):

.   [ 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.

.  .   changeset:   14717:691e3941d950
.  .   parent:      14715:fe7fe04ccc9a
.  .   parent:      14716:57e9ad7b408c
.  .   user:        Oz Linden <oz@lindenlab.com>
.  .   date:        Sat Jan 29 15:35:54 2011 -0500
.  .   summary:     Automated merge with file:///Users/oz/Work/V-D

.  .  .   [ default ]
.  .  .   changeset:   14716:57e9ad7b408c
.  .  .   parent:      14709:45a63ad4d737
.  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .   date:        Sat Jan 29 13:09:55 2011 -0500
.  .  .   summary:     correct DOS line endings

.  .  .   changeset:   14709:45a63ad4d737
.  .  .   parent:      14708:1237987d1af9
.  .  .   parent:      14700:54109970bb3f
.  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .   date:        Fri Jan 28 17:05:11 2011 -0500
.  .  .   summary:     pull back fixes from beta

.  .  .  .   [ default ]
.  .  .  .   changeset:   14700:54109970bb3f
.  .  .  .   parent:      14699:b43d93d380a5
.  .  .  .   parent:      14682:b542f8134a2b
.  .  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 19:04:26 2011 -0500
.  .  .  .   summary:     merge beta tags

.  .  .  .   changeset:   14699:b43d93d380a5
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:45:42 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-33_2.5.0-beta2 for changeset 54d772d8687c

.  .  .  .   changeset:   14698:4b8d6aa5f96e
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:45:14 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-32_2.5.0-beta1 for changeset 345b17e7cf63

.  .  .  .   changeset:   14697:ef7323702ee2
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:44:57 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-25_2.4.0-release for changeset 1ed382c6a08b

.  .  .  .   changeset:   14696:3f4135badde9
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:44:40 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-27_2.4.0-beta2 for changeset 25bd6007e3d2

.  .  .  .   changeset:   14695:025ceaa4cf56
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:44:23 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-26_2.4.0-beta1 for changeset 3bc1f50a72e1

.  .  .  .   changeset:   14694:aa89478f7040
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:44:05 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-13_2.3.0-release for changeset 6ad3d6fa35a4

.  .  .  .   changeset:   14693:c52bb8ad58a7
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:43:49 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-20_2.3.0-beta3 for changeset 6ad3d6fa35a4

.  .  .  .   changeset:   14692:1aa180baa8ce
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:43:10 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-17_2.3.0-beta2 for changeset db0fe9bb6518

.  .  .  .   changeset:   14691:6d1be2ffde8a
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:42:32 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-14_2.3.0-beta1 for changeset a3c12342b1af

.  .  .  .   changeset:   14690:92dd48629eac
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:42:03 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-8_2.2.0-release for changeset 1415e6538d54

.  .  .  .   changeset:   14689:263e4859cfe2
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:41:46 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-7_2.2.0-beta3 for changeset b0cd7e150009

.  .  .  .   changeset:   14688:ce0d1ed8dc2d
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:41:21 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-3_2.2.0-beta2 for changeset 9822eb3e25f7

.  .  .  .   changeset:   14687:4ec5e767b6c3
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 14:40:14 2011 -0800
.  .  .  .   summary:     Added tag DRTVWR-5_2.2.0-beta1 for changeset 7076e22f9f43

.  .  .  .   changeset:   14686:fa941b79865b
.  .  .  .   parent:      14671:ffd632c2fa5d
.  .  .  .   user:        Dessie Linden <dessie@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 11:43:08 2011 -0800
.  .  .  .   summary:     Removed DRTVWR from 2.5.0-beta2 tag

.  .  .   [ default ]
.  .  .   changeset:   14708:1237987d1af9
.  .  .   parent:      14707:8760544e7449
.  .  .   parent:      14704:fc518f2cff05
.  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .   date:        Fri Jan 28 14:26:59 2011 -0500
.  .  .   summary:     merge fixes for SOCIAL-452 and STORM-927

.  .  .  .   [ default ]
.  .  .  .   changeset:   14704:fc518f2cff05
.  .  .  .   parent:      14703:f40ad8d0c5ec
.  .  .  .   parent:      14702:f9bb7807227d
.  .  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .  .   date:        Fri Jan 28 11:36:46 2011 -0500
.  .  .  .   summary:     merge changes for storm-634

.  .  .  .  .   [ default ]
.  .  .  .  .   changeset:   14702:f9bb7807227d
.  .  .  .  .   parent:      14701:f3acdb1faaa6
.  .  .  .  .   parent:      14699:b43d93d380a5
.  .  .  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .  .  .   date:        Fri Jan 28 11:30:17 2011 -0500
.  .  .  .  .   summary:     merge changes for social-473

.  .  .  .  .   changeset:   14701:f3acdb1faaa6
.  .  .  .  .   parent:      14620:54d772d8687c
.  .  .  .  .   user:        Richard Linden
.  .  .  .  .   date:        Mon Jan 24 18:41:42 2011 -0800
.  .  .  .  .   summary:     SOCIAL-473 FIX Add Kick, Freeze, Unfreeze and CSR to profile mini floater drop down

.  .  .  .   [ default ]
.  .  .  .   changeset:   14703:f40ad8d0c5ec
.  .  .  .   parent:      14649:746172ee0da1
.  .  .  .   user:        Eli Linden <eli@lindenlab.com>
.  .  .  .   date:        Thu Jan 27 13:33:26 2011 -0800
.  .  .  .   summary:     STORM-634 FIX missing Danish translation

.  .  .   [ default ]
.  .  .   changeset:   14707:8760544e7449
.  .  .   parent:      14706:d920509e1393
.  .  .   parent:      14699:b43d93d380a5
.  .  .   user:        callum
.  .  .   date:        Fri Jan 28 11:20:36 2011 -0800
.  .  .   summary:     Merge

.  .  .   changeset:   14706:d920509e1393
.  .  .   user:        callum
.  .  .   date:        Fri Jan 28 11:18:11 2011 -0800
.  .  .   summary:     SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be optimized for Web profile display

.  .  .   changeset:   14705:f09beb38f756
.  .  .   parent:      14593:282a16c0bffb
.  .  .   user:        callum
.  .  .   date:        Fri Jan 28 11:17:18 2011 -0800
.  .  .   summary:     STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7

.  .   [ default ]
.  .   changeset:   14715:fe7fe04ccc9a
.  .   parent:      14709:45a63ad4d737
.  .   parent:      14714:3aab4a54e6d9
.  .   user:        Xiaohong Bao <bao@lindenlab.com>
.  .   date:        Fri Jan 28 21:23:35 2011 -0700
.  .   summary:     Automated merge with http://hg.secondlife.com/viewer-development

.  .  .   [ default ]
.  .  .   changeset:   14714:3aab4a54e6d9
.  .  .   user:        Xiaohong Bao <bao@lindenlab.com>
.  .  .   date:        Fri Jan 28 21:23:19 2011 -0700
.  .  .   summary:     trivial: remove some debug code.

.  .  .   changeset:   14713:4de3178c6c81
.  .  .   user:        Xiaohong Bao <bao@lindenlab.com>
.  .  .   date:        Fri Jan 28 17:19:42 2011 -0700
.  .  .   summary:     fixed the major memory leaking for SH-723/SH-847: memoy leaking

.  .  .   changeset:   14712:c6bad5df2c9b
.  .  .   user:        Xiaohong Bao <bao@lindenlab.com>
.  .  .   date:        Fri Jan 28 17:01:18 2011 -0700
.  .  .   summary:     trivial: convert to "unix return"

.  .  .   changeset:   14711:39b379b771f0
.  .  .   user:        Xiaohong Bao <bao@lindenlab.com>
.  .  .   date:        Wed Jan 26 17:03:30 2011 -0700
.  .  .   summary:     add "pause" function for SH-846: design and implement the debug code to locate memory leaking

.  .  .   changeset:   14710:c8c4058fe309
.  .  .   parent:      14667:26c09ad4293e
.  .  .   user:        Xiaohong Bao <bao@lindenlab.com>
.  .  .   date:        Wed Jan 26 11:13:04 2011 -0700
.  .  .   summary:     for SH-846: design and implement the debug code to locate memory leaking

.   [ 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

.  .  .  .  .   [ default ]
.  .  .  .  .   changeset:   14721:80c054b156c8
.  .  .  .  .   parent:      14720:6f044de78d1d
.  .  .  .  .   parent:      14719:41771155b350
.  .  .  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .  .  .   date:        Mon Jan 31 12:26:23 2011 -0500
.  .  .  .  .   summary:     merge changes for storm-643

.  .  .  .  .  .   [ default ]
.  .  .  .  .  .   changeset:   14719:41771155b350
.  .  .  .  .  .   parent:      14718:d9a5183dfb95
.  .  .  .  .  .   parent:      14717:691e3941d950
.  .  .  .  .  .   user:        Oz Linden <oz@lindenlab.com>
.  .  .  .  .  .   date:        Mon Jan 31 12:25:35 2011 -0500
.  .  .  .  .  .   summary:     merge changes for storm-351

.  .  .  .  .  .   changeset:   14718:d9a5183dfb95
.  .  .  .  .  .   parent:      14668:38ed1abd9cd9
.  .  .  .  .  .   user:        paul_productengine
.  .  .  .  .  .   date:        Wed Jan 26 20:24:49 2011 +0200
.  .  .  .  .  .   summary:     STORM-351 FIXED Scrolling flat list by mouse wheel changes zoom level in-world

.  .  .  .  .   [ default ]
.  .  .  .  .   changeset:   14720:6f044de78d1d
.  .  .  .  .   parent:      14669:6094386369a0
.  .  .  .  .   user:        Twisted Laws
.  .  .  .  .   date:        Wed Jan 26 19:22:42 2011 -0500
.  .  .  .  .   summary:     Embed Minimap into the Nearby list of the People Sidebar

.  .  .   [ 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.