summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-05-11merge latest integration repo changesOz Linden
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-10NORSPEC-132 Fix for Rotation degree has range -9999.00..9999.00callum_linden
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs (...Graham Madarasz
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10NORSPEC-173 Shrink size of matrix palette for backwards compatibility.Dave Parks
2013-05-10merge changes for 3.5.2-beta5Oz Linden
2013-05-10Merge with vwr-dev-matGraham Madarasz
2013-05-10Remove some unreachable codeDave Parks
2013-05-10fix merge error in 3.5.2 mergeOz Linden
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-10merge changes for latest project changesOz Linden
2013-05-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing...Kitty Barnett
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in add...Graham Madarasz
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in add...Graham Madarasz
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid cross-...Graham Madarasz
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid cross-...Graham Madarasz
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loade...Graham Madarasz
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loade...Graham Madarasz
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-09MAINT-2665 FIX Crashes not being reported in some casesRichard Linden
2013-05-09remove duplications and other errors introduced during the mergeOz Linden
2013-05-08Rollback NORSPEC-156 change which fails to compile due to implicit castGraham Madarasz
2013-05-08Rollback NORSPEC-156 change which fails to compile due to implicit castGraham Madarasz
2013-05-08Fix fullbrightF in the eyes of ancient nV compilerGraham Madarasz
2013-05-08NORSPEC-156 back to the fix that actually worksGraham Madarasz
2013-05-08NORSPEC-156 back to the fix that actually worksGraham Madarasz
2013-05-08NORSPEC-156 move gamma correction to vert shaderGraham Madarasz
2013-05-08NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with ...Graham Madarasz
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-08Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-07Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI r...Graham Madarasz
2013-05-08NORSPEC-156 move gamma correction to vert shaderGraham Madarasz
2013-05-08NORSPEC-156 modify fullbrightF colorspace conversion to eliminate delta with ...Graham Madarasz
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI r...Graham Madarasz
2013-05-07Fix for bad light map generation/sampling.Dave Parks
2013-05-07NORSPEC-119 another attempt at individual faces edits without side-effectsGraham Madarasz
2013-05-07NORSPEC-119 another attempt at individual faces edits without side-effectsGraham Madarasz
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-07NORSPEC-165 tweak panel_tools_texture layout to uncrop the planar align checkboxGraham Madarasz
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-07NORSPEC-51 Fix (additional) Added missing imagecallum_linden
2013-05-07merge changes for DRTVWR-315Oz Linden
2013-05-06Merge with lindenlab/viewer-development-materialscallum_linden
2013-05-06MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()callum_linden
2013-05-06Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks