summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-01mergeTofu Buzzard
2011-02-01Fixes for merge up from viewer-development to mesh-development.Loren Shih
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01mergeTofu Buzzard
2011-02-01Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-01Automated merge from mesh-developmentLoren Shih
2011-02-01merge changes back from beta branchOz Linden
2011-02-01SH-831 Fix for local lights option not disabling local lights.Dave Parks
2011-02-01mergeDave Parks
2011-02-01SH-641 Cosmetic fix -- keep showing last rendered mesh LoD if requested LoD ↵Dave Parks
is unavailable.
2011-01-31MergeKent Quirk
2011-01-31VWR-22024 -- apply Bao's patch to betaKent Quirk
2011-01-31mergeBrad Payne (Vir Linden)
2011-01-31SH-872 WIP - temporarily disabling problematic log output to see if that ↵Brad Payne (Vir Linden)
fixes crash on test machine
2011-01-31Fix for Sh-512: Scales use their previous maximum valueprep
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-30mergeTofu Buzzard
2011-01-29Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-01-29correct DOS line endingsOz Linden
2011-01-28merge the changeset 4de3178c6c81 from viewer-development: fixed the major ↵Xiaohong Bao
memory leaking for SH-723/SH-847: memoy leaking
2011-01-28Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-28trivial: remove some debug code.Xiaohong Bao
2011-01-28automated mergeRoxie Linden
2011-01-28Mergeleyla_linden
2011-01-28SH-808 making sure the 10m vs. 64m scale limit switch happens for both the ↵leyla_linden
spinner and the manipulation tools etc.
2011-01-28SH-753 - Ghost meshesRoxie Linden
Fix the case where the silhouette shown when editing a mesh in an adjacent region was showing up in the wrong place. The silhouette was not being translated by the avs view with respect to the region.
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-28mergeBrad Payne (Vir Linden)
2011-01-28SH-845 FIX - display a message before bailing out if CPU lacks SSE2 supportBrad Payne (Vir Linden)
2011-01-28pull back fixes from betaOz Linden
2011-01-28SH-841 Hide physics parameters in build tools when connected to a region ↵leyla_linden
that doesn't support additional physics parameters.
2011-01-28SH-887 Upload model options available when MeshEnabled set to Falseleyla_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