summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-19merge changes for DRTVWR-326Oz Linden
2013-06-19NORSPEC-272 make sure the tex filtering fix stays putGraham Linden
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 increment of version numberOz Linden
2013-06-18Review cleanupDave Parks
2013-06-18Occlusion culling overhaul.Dave Parks
2013-06-18correct banding issueOz Linden
2013-06-18remove files incorrectly brought back from the past by mergesOz Linden
2013-06-14increment viewer version to 3.6.1Oz Linden
2013-06-14NORSPEC-251 fix issues with binding unloaded standard bumpmapsGraham Linden
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-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-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)
2013-06-12NORSPEC-260 fix issues with OK after pressing none being intepreted as add a ↵Graham Madarasz
null normal map
2013-06-12NORSPEC-251 fixed and 258 not regressedGraham Madarasz
2013-06-12Remove NaN guards from vopartgroup and volume codeGraham Madarasz
2013-06-12Cleanup rollback and try point MIPs experiment to see if that's what is ↵Graham Madarasz
hosing the Mac on 10.6.8
2013-06-12MergeGraham Madarasz
2013-06-12Backout tangent assert experimentGraham Madarasz
2013-06-12Pedantic adj overly concerned with minute details or formalismsGraham Madarasz
2013-06-12Changes to protect against use of normalize3fast on degenerate vectorsGraham Madarasz
2013-06-12Fix issues with NaNs in tangent data from using normalize3fast on ↵Graham Madarasz
zero-length vectors and other data conditioning; also added assert to normalize3fast to make finding these problems easier in the future
2013-06-11NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI ↵Graham Madarasz
correctly and fix issues with transition from no-bumps to normal maps
2013-06-11Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-11NORSPEC-259 Fix for crash in LLRenderTarget::copyContentsToFramebufferDave Parks
2013-06-11Fix build failure from warning and dav3p no-JIRA bug about normal map scale ↵Graham Madarasz
editing
2013-06-11NORSPEC-257 can't use automated TEMaterialGet functor as we need two ↵Graham Madarasz
possible defaults for diffuse alpha mode based on the alpha content of the diffuse texture
2013-06-11Speculative fix for tangent calc asserts on MacGraham Madarasz
2013-06-11Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-10NORSPEC-222 fix issues with removing the use texture item selecting weave ↵Graham Madarasz
when the TE was BUMPY_TEXTURE, but no normal map was applied
2013-06-10NORSPEC-257 fix alpha mode display incorrect default when alpha is present ↵Graham Madarasz
in tex
2013-06-10MAINT-2777 work-around for APR assert_always causing random crash in ↵Graham Madarasz
materials build
2013-06-10NORSPEC-251 fix issues with not binning objects changed from having a ↵Graham Madarasz
material to using legacy bumps causing incorrect rendering
2013-06-10NORSPEC-252 fix reverting normal maps to noneGraham Madarasz
2013-06-10NORSPEC-242 Followup, fix a couple more sources of NaN and infinity.Dave Parks