summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-02STORM-953 Clarify what happens when you uncheck Allow Public AccessJonathan Yap
Note: This change also incorporates STORM-960
2011-02-02STORM-960 Descriptive text missing next to first checkbox in About Land/AccessJonathan Yap
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
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 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-01SH-512: Inworld scale weights use previous maximum (10)prep linden
2011-02-01STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg)paul_productengine
- Added filter "jpg" for "Save As..." dialog so that *.jpg files can be seen as well as *.jpeg.
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-31STORM-507 FIXED User that has sent p2p call invitation to other user, is not ↵paul_productengine
added to Recent tab - Add the caller to the Recent List just after Incoming Call floater appears. Before recicpient accepted or rejected the call.
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-28merge the changeset 4de3178c6c81 from viewer-development: fixed the major ↵Xiaohong Bao
memory leaking for SH-723/SH-847: memoy leaking