summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-20NORSPEC-278 fix misuse of legacy bumps when rendering objects with TE ↵Graham Linden
bumpmap setting of 18 aka BUMPY_TEXTURE
2013-06-20CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-19merge changes for DRTVWR-326Oz Linden
2013-06-19MergeGraham Linden
2013-06-19Merge conflict mixup, use noaction instead of none for user preferenceMerov Linden
2013-06-19NORSPEC-272 make sure the tex filtering fix stays putGraham Linden
2013-06-19MergeGraham Linden
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-19Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-06-19Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-06-19Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-19Point light color (de)correction.Dave Parks
2013-06-19Merge vwr-dev-mat release tags and version changeGraham Linden
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19merge increment of version numberOz Linden
2013-06-18Review cleanupDave Parks
2013-06-18Occlusion culling overhaul.Dave Parks
2013-06-18Merge vwr-dev-matGraham Linden
2013-06-18CHUI-979 FIXED Clear highlight after clicking in chat input. Do not flash ↵Mnikolenko ProductEngine
chat button if current conversation is focused and torned off.
2013-06-18correct banding issueOz Linden
2013-06-18remove files incorrectly brought back from the past by mergesOz Linden
2013-06-18NORSPEC-246 make 32F light LUT apply to all OS X machines as several non-nV ↵Graham Linden
cards were also failing
2013-06-17Fixed build issuemsavchenko@ubuntu
2013-06-17merge changes for 3.6.0-releaseOz Linden
2013-06-17NORSPEC-246 Force light func to use GL_R32F format for more precision on ↵Graham Madarasz
older nV mobile cards with single FP hardware
2013-06-17CHUI-506 FIXED Don't change dropdown position if items are unchanged.Mnikolenko ProductEngine
2013-06-17MAINT-318 prevent crashes from incomplete quads and lines and prevent ↵Graham Linden
drivers from crashing to desktop when passed short buffers
2013-06-15Silence spurious asserts when pool is cleared at exactly it's limitGraham Linden
2013-06-15NORSPEC-267 fix UI feedback for materials edits not appearing for observers ↵Graham Linden
when obj was selected by them
2013-06-14increment viewer version to 3.6.1Oz Linden
2013-06-14NORSPEC-251 fix issues with binding unloaded standard bumpmapsGraham Linden
2013-06-14MAINT-2791: Yet another crash in LLTextureCache::writeToFastCache(). Reviewedsimon
by Kelly
2013-06-14mergemberezhnoy
2013-06-14NORSPEC-266 fix issues with observer feedback on edits of material map ↵Graham Linden
parameters
2013-06-14Disable asserts in CalculateTangentArray (discussed with davep) to avoid ↵Graham Linden
debugging interruptions from bad assets
2013-06-13NORSPEC-261 No more magic numbers, parity between forward and deferred ↵Dave Parks
rendering WRT to windlight and legacy shininess. Reviewed by Graham (a little bit).
2013-06-13NORSPEC-250 speculative stab in the darkGraham Linden
2013-06-13MAINT-2787: Expand viewer_manifest.py's "Release" recognitionNat Goodspeed
viewer_manifest.py currently detects specifically the channel name "Second Life Release" as a release viewer (affecting the icon and other things). The Amazon viewer uses channel name "Second Life Release - Amazon", which is currently not recognized at all, therefore uses a developer-build icon with the caution tape and the word "TEST" stamped onto it. Detect any channel name *starting* with "Second Life Release" as a release viewer.
2013-06-13STORM-1953 Notifications that involve deleting something -- errors in textJonathan Yap
2013-06-13Remove some now useless assertions.Dave Parks
2013-06-13NORSPEC-261 Put back directional ambient.Dave Parks
2013-06-13NORSPEC-261 Better blending of environment map.Dave Parks
2013-06-13NORSPEC-261 Fix for bad legacy shiny values.Dave Parks
2013-06-13Fix ternary use found illegit in the eyes of GCCGraham Madarasz
2013-06-13CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Added callback for friendship checking
2013-06-13Merge vwr-dev-matGraham Madarasz
2013-06-13correct DOS line endingsOz Linden
2013-06-13NORSPEC-263 replaced dropped deg to rad conversion between UI and material ↵Graham Madarasz
update
2013-06-13MAINT-2632 speculative guards in display_startup based on prevalence of ↵Graham Madarasz
crashes ending there (no repro, unfortunately)