summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-06-24mergeBrad Payne (Vir Linden)
2013-06-21SH-4240 FIX Users can set their hover height to 0Nyx Linden
Adjusted the startup conditions, and relogging should apply the enforcement as appropriate now. Note that this affects the startup enforcement and should re-test the macro avatar loading bug.
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-19merge changes for DRTVWR-326Oz Linden
2013-06-19SH-4263 FIX - added yet another level of callback kludgery to ↵Brad Payne (Vir Linden)
updateAppearanceFromCOF()
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-18mergeBrad Payne (Vir Linden)
2013-06-18SH-4237 WIP - removed somewhat misleading warningBrad Payne (Vir Linden)
2013-06-18mergeBrad Payne (Vir Linden)
2013-06-18SH-4262 WIP - fix for the reordering bug in AIS regions.Brad Payne (Vir Linden)
2013-06-18merge with viewer-releaseNyx Linden
2013-06-18correct banding issueOz Linden
2013-06-18remove files incorrectly brought back from the past by mergesOz Linden
2013-06-18SH-4275: Fixed regression - appearances are no longer broadcasted before ↵prep@lindenlab.com
exiting appearance editor
2013-06-17SH-4274 FIX Adding RegionHandshakeReply flags for SSANyx Linden
Adding a flag to hint to the sim that this viewer knows how to handle AvatarAppearance messages for self in SSA-enabled regions.
2013-06-17SH-4237 WIP - logging cleanup in onAIS handlingBrad Payne (Vir Linden)
2013-06-17mergeBrad Payne (Vir Linden)
2013-06-17SH-4238 WIP - postpone calling notifyObservers until all deletes are processed.Brad Payne (Vir 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-14WIP: sh-4035 backed out changes to appearance window confirmationprep@lindenlab.com
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-13SH-4250 WIP - logging tweaks and cleanupBrad Payne (Vir 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