summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-03SH-580 FIXED Crash in curl on exitLoren Shih
New defensive programming added this llerrs trigger. This is worth investigating but not at the top of our priority at the moment. Reverting to llinfos for now as has been done for non-Windows builds already.
2011-02-03STORM-513 : pull into viewer-developmentMerov Linden
2011-02-03STORM-397 : pull into viewer-developmentMerov Linden
2011-02-03STORM-316 : pull into viewer-developmentMerov Linden
2011-02-03Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-02mergeDave Parks
2011-02-02SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.Dave Parks
2011-02-02Tweak to physics shape display render to show convex decompositions.Dave Parks
2011-02-02Merge with viewer-developmentMerov Linden
2011-02-02STORM-435 : pull into viewer-developmentMerov Linden
2011-02-02Pull from viewer-betaMerov Linden
2011-02-02STORM-957 : pull in viewer-beta (da and fr localization)Merov Linden
2011-02-02Mergeleyla_linden
2011-02-02SH-734 - also adding fix into the llcapabilitylistner testleyla_linden
2011-02-02Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-02Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-02fix for Sh-445: debug settings -> "CacheNumberOfRegionsForObjects" does not ↵Xiaohong Bao
limit the number of object cache files
2011-02-01Sync with viewer-developmentMerov Linden
2011-02-01Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-01STORM-484 : pull in viewer-developmentMerov Linden
2011-02-01fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially)Xiaohong Bao
2011-02-01Mergeleyla_linden
2011-02-01SH-734 [REGRESSION] INTEGRATION_TEST_llsdmessage and _capabilitylistener ↵leyla_linden
failing in opensource environment
2011-02-01fix for SH-891: crash at LLDrawable::getFace(int)Xiaohong Bao
2011-02-01CT-635 FIX DA and FR translationEli Linden
2011-02-01mergeDave Parks
2011-02-01mergeDave Parks
2011-02-01SH-818 Fix for inability to disable anti-aliasing on ATI catalyst.Dave Parks
2011-02-01Sync with viewer-betaEli Linden
2011-02-01mergeprep linden
2011-02-01SH-512: Inworld scale weights use previous maximum (10)prep linden
2011-02-01merge fix for SH-659 from v-d to mesh: small textures not loadedXiaohong Bao
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-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-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-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