summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-11-21merge changes for storm-1634Oz Linden
2011-11-21merge changes for vmrg-189Oz Linden
2011-11-21merge changes for vmrg-188Oz Linden
2011-11-21merge changes for storm-1684Oz Linden
2011-11-21Add "Use Region Settings" to World->Sun menuTofu Buzzard
2011-11-21merge changes for storm-1663Oz Linden
2011-11-21merge changes for storm-1679Oz Linden
2011-11-21EXP-1630 FIXED Only show snapshot size spinners and "Constrain proportions" ↵Vadim ProductEngine
checkbox when Custom resolution is selected.
2011-11-19Make LLSD diagnostic methods conditional on LLSD_DEBUG_INFO.Nat Goodspeed
This establishes that there are no viewer-side unit tests relying on these methods. The point is to try to clean up the LLSD public API. In the same vein, remove from LLSD public API a diagnostic method which is nothing more than an implementation detail for the corresponding LLSD::Impl method. The same effect can be achieved by making LLSD::Impl a friend of LLSD, moving the method with the messy signature (classic-C arrays!) into LLSD::Impl itself.
2011-11-18Removed unused code from alpha fragment shaders to fix some mac rendering ↵Leslie Linden
glitches with non-fullbright alpha objects.
2011-11-18pull back 3.2.2 beta 2 fixesOz Linden
2011-11-18SH-2700 Fix for random black textures due to texture index out of bounds. ↵Dave Parks
Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18SH-2699 Potential fix for occlusion culling being overly aggressive on 9800 GTDave Parks
2011-11-18mergeBrad Payne (Vir Linden)
2011-11-18Re-added some missing calls to apr_pool_destroy() that I failed to readd ↵Logan Dethrow
after the thread local storage rollback. Also added a call to LLProxy::cleanupClass() to prevent indra/test from segfaulting on exit.
2011-11-18merge changes for vmrg-186Oz Linden
2011-11-18MergeLogan Dethrow
2011-11-18STORM-591 Removed commented out debugging linesJonathan Yap
2011-11-17LLSD-14: fixed way-too-overloaded local variable.Nat Goodspeed
2011-11-17LLSD-14: Make dumpStats()/calcStats() implementation more robustNat Goodspeed
per Monty code review
2011-11-17EXP-1559 FOLLOWUP Changed the success message for profile feed.Vadim ProductEngine
2011-11-17SH-2663 WIP, SH-2667 FIX - better logic for when to copy temp files, only ↵Brad Payne (Vir Linden)
uninstall V2 when called from auto-update, clean temp files when done
2011-11-17mergeDave Parks
2011-11-17SH-2670 Fix for terrain being wrong detail.Dave Parks
2011-11-17LLSD-14: while we're in llsd.h anyway, fix longstanding misspellings.Nat Goodspeed
My tollerance is at an end. :-P
2011-11-17LLSD-14: Add tests from Simon's server-trunk changeset 3852648182db.Nat Goodspeed
That changeset provides most of the changes previously checked in on this Jira (viewer changeset 22b293aae639). Bring over the code he added to llsd_new_tut.cpp as well.
2011-11-17LLSD-14: Fix silly syntax error in subscript bounds check.Nat Goodspeed
2011-11-17LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.Nat Goodspeed
Because new enum values have been added to the LLSD type field, a few external switch statements must be adjusted to suppress fatal warnings, even though we never expect to encounter an LLSD instance containing any of the new values.
2011-11-16FIX VWR-26774eli
2011-11-16FIX VWR-26744eli
2011-11-16Merge with latestLeslie Linden
2011-11-16SH-1618 FIXLeslie Linden
SH-1619 FIX SH-1620 FIX SH-2621 FIX * Got lighting, shadows, and ambient occlusion working on ATI macs. * Re-enabled ambient occlusion on ATI macs. * Re-enabled depth of field on ATI macs. Reviewed by Runitai Linden.
2011-11-16SH-2675 Fix for shadow appearing on terrain at midday when terrain is ↵Dave Parks
totally flat and there are no prims visible
2011-11-16SH-2690 Add comments per Vir's review feedbackDave Parks
2011-11-16SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting ↵Dave Parks
flexi attachments.
2011-11-16merge changes for storm-1685Oz Linden
2011-11-16EXP-1597 FIXED Reshape save status messages correctly.Vadim ProductEngine
2011-11-16merge changes for vmrg-185Oz Linden
2011-11-16mergeDave Parks
2011-11-16SH-2240 Make alpha mask cutoff even less aggressive (fix for eyes on Curious ↵Dave Parks
Ringtail avatar)
2011-11-16EXP-1594 FIXED Stop the upload progress indicator if inventory texture ↵Vadim ProductEngine
upoload fails.
2011-11-16SH-1865 FIX -- removed some old non-deferred rendering code that was ↵Leslie Linden
preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported
2011-11-16EXP-1562 WIP Turned the Save button into flyout (Save / Save as).Vadim ProductEngine
By the way, fixed: * inability to save a snapshot to disk after pressing "Cancel" in the file picker. * displaying "Saved to computer!" after pressing "Cancel" in the file picker.
2011-11-16EXP-1562 WIP Disable custom resolution controls by default (when "Current ↵Vadim ProductEngine
Window" is pre-select).
2011-11-16EXP-1560 FIXED Removed misleading "Constrain proportions" checkbox from the ↵Vadim ProductEngine
"Save to My Inventory" panel.
2011-11-15SH-1865 PROGRESS -- Disable the anti-aliasing control on hardware our code ↵Leslie Linden
doesn't support for anti-aliasing
2011-11-15sync with viewer-development, plus some Russian linguistic changeseli
2011-11-15SH-2563 FIX -- Added diffuse map to the avatar rigid pass to properly set up ↵Leslie Linden
the eyeball texture for Mac OS Lion
2011-11-15mergeDave Parks
2011-11-15WIP INTL-82 further LQA changes for Russianeli