summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-08-01Merge downstream codesimon
2013-08-01Mergesimon
2013-08-01MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"simon
2013-08-01MAINT-2949 : Objects across the sim border do not render when approached. Addedsimon
missing code block from previous change as per Dave P's advice
2013-07-30Merge downstream codesimon
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-15MAINT-2849 FIX Certain streams that play with FMod do not play with FModExcallum_linden
2013-07-12MAINT-2875 FIXED Shortcut was changed and menu item was added.maxim@mnikolenko
2013-07-11MAINT-2879 : Viewer should revoke animation permissions with "Stop Animating Me"simon
Reviewed by Kelly
2013-07-09[MAINT-2386] Viewer crashes when user move landmarks from Inventory -> ↵Baker Linden
Landmarks or Places to Favorite bar Forgot to commit the errant comment -- double whoopsie all the way across the sky!
2013-07-09[MAINT-2386] - Viewer crashes when user move landmarks from Inventory -> ↵Baker Linden
Landmarks or Places to Favorite bar - Pushed to viewer-cat for release.
2013-07-02Mergesimon
2013-07-02MAINT-2808 Viewer side : Stats for OBJECT_ATTACHMENT_GEOMETRY_BYTES and ↵simon
OBJECT_ATTACHMENT_SURFACE_AREA do not return to the 'no attachments' values after avatar removes last attachment
2013-07-02Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-07-02NORSPEC-290 Disable occlusion culling for distortion render target since ↵Dave Parks
there are generally zero under water occluders.
2013-07-02MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and ↵Maestro Linden
corrected related tooltips
2013-07-02MAINT-1312 Fixed a typo in PRIM_TEMP_ON_REZ tooltip. Reviewed by Kelly.Maestro Linden
2013-07-02MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by ↵Maestro Linden
Kelly.
2013-07-01NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, ↵Dave Parks
slight cleanup.
2013-07-01Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-07-01NORSPEC-290 Shader optimization WIP -- remove some more divides and ↵Dave Parks
normalizes from various lighting functions, rework flow control based on profile feedback.
2013-06-28Merge with viewer-bear which was just merged with viewer-releasecallum_linden
2013-06-28NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and ↵Dave Parks
divides from various lighting functions.
2013-06-27Merge with viewer-releasecallum_linden
2013-06-27increment viewer version to 3.6.2Oz Linden
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 ↵Dave Parks
implementations
2013-06-26Merge cleanup.Dave Parks
2013-06-26Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366Dave Parks
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightFDave Parks
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-06-25MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting ↵Dave Parks
falloff (again).
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-24MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not ↵Graham Madarasz (Graham)
slow down on ATI on Mac
2013-06-24merge changes for DRTVWR-326 3.6.1-beta1Oz Linden
2013-06-24NORSPEC-280 include fix to downsampleDepthRect shader making GL 3.3. drivers cryGraham Linden
2013-06-21Merge cleanup.Dave Parks
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-21Only render bounding boxes for volumes in info display.Dave Parks
2013-06-20NORSPEC-277 WIP backout old-school normal permutationGraham Linden
2013-06-20Try to track down some bad bounding boxes in particles.Dave Parks
2013-06-20MATBUG-204 Fix for crash in genVolumeBBoxesDave Parks
2013-06-20Merge cleanupDave Parks
2013-06-20NORSPEC-262 make drag and drop aware of editing context so that editing ↵Graham Linden
normal/spec textures causes application to the correct tex channel
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-19merge changes for DRTVWR-326Oz Linden