summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-01mergeDave Parks
2011-02-01merge changes back from beta branchOz Linden
2011-02-01mergeDave Parks
2011-02-01SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ↵Dave Parks
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.
2011-01-31MergeKent Quirk
2011-01-31VWR-22024 -- apply Bao's patch to betaKent Quirk
2011-01-31merge changes for storm-934Oz Linden
2011-01-31pull changes for STORM-940 and CHOP-369Oz Linden
2011-01-31merge changes for storm-845Oz Linden
2011-01-31merge changes for storm-829Oz Linden
2011-01-31merge changes for storm-643Oz Linden
2011-01-31merge changes for storm-351Oz Linden
2011-01-29Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-01-29correct DOS line endingsOz Linden
2011-01-28Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-28trivial: remove some debug code.Xiaohong Bao
2011-01-28fixed the major memory leaking for SH-723/SH-847: memoy leakingXiaohong Bao
2011-01-28trivial: convert to "unix return"Xiaohong Bao
2011-01-28Merge with headcallum
2011-01-28STORM-934 POSSIBLE FIX [crashhunters] crash at [2] ↵callum
LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp]
2011-01-28pull back fixes from betaOz Linden
2011-01-28merge fixes for SOCIAL-452 and STORM-927Oz Linden
2011-01-28Mergecallum
2011-01-28SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be ↵callum
optimized for Web profile display
2011-01-28STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing ↵callum
web-based content on development viewers using recent Webkit 4.7 Also removed refs to debug vars used to specify location of pem file
2011-01-28merge changes for storm-634Oz Linden
2011-01-28merge changes for social-473Oz Linden
2011-01-27merge beta tagsOz Linden
2011-01-27Added tag DRTVWR-33_2.5.0-beta2 for changeset 54d772d8687cDessie Linden
2011-01-27Added tag DRTVWR-32_2.5.0-beta1 for changeset 345b17e7cf63Dessie Linden
2011-01-27Added tag DRTVWR-25_2.4.0-release for changeset 1ed382c6a08bDessie Linden
2011-01-27Added tag DRTVWR-27_2.4.0-beta2 for changeset 25bd6007e3d2Dessie Linden
2011-01-27Added tag DRTVWR-26_2.4.0-beta1 for changeset 3bc1f50a72e1Dessie Linden
2011-01-27Added tag DRTVWR-13_2.3.0-release for changeset 6ad3d6fa35a4Dessie Linden
2011-01-27Added tag DRTVWR-20_2.3.0-beta3 for changeset 6ad3d6fa35a4Dessie Linden
2011-01-27Added tag DRTVWR-17_2.3.0-beta2 for changeset db0fe9bb6518Dessie Linden
2011-01-27Added tag DRTVWR-14_2.3.0-beta1 for changeset a3c12342b1afDessie Linden
2011-01-27Added tag DRTVWR-8_2.2.0-release for changeset 1415e6538d54Dessie Linden
2011-01-27Added tag DRTVWR-7_2.2.0-beta3 for changeset b0cd7e150009Dessie Linden
2011-01-27Added tag DRTVWR-3_2.2.0-beta2 for changeset 9822eb3e25f7Dessie Linden
2011-01-27Added tag DRTVWR-5_2.2.0-beta1 for changeset 7076e22f9f43Dessie Linden
2011-01-27STORM-634 FIX missing Danish translationEli Linden
2011-01-27Removed DRTVWR from 2.5.0-beta2 tagDessie Linden
2011-01-27STORM-940: use the tip, not the dialog.Andrew A. de Laix
2011-01-27more for storm 940: treat the manditory download after login like an ↵Andrew A. de Laix
optional one.
2011-01-27Automated merge with file:///Users/oz/Work/V-DROz Linden
2011-01-27merge changes for beta fixesOz Linden
2011-01-27Merged beta2 tagDessie Linden
2011-01-27merge changes for storm-348Oz Linden
2011-01-27merge changes for storm-843Oz Linden