summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-05-14NORSPEC-85 fix default normal vert offsetGraham Madarasz
2013-05-14NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in ↵Graham Madarasz
graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
2013-05-12LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::nullKitty Barnett
2013-05-12Avoid code duplication in LLMaterialMgrKitty Barnett
2013-05-12Refactor LLPanelFace to make it clearer that the material is a property of ↵Kitty Barnett
the face(s) and never the panel
2013-05-12Merged with viewer-dev-materialsKitty Barnett
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-05-11increment version to 3.5.3Oz Linden
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
(unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10Fixup merge diffsGraham Madarasz
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 ↵Kitty Barnett
editing the object
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in ↵Graham Madarasz
addition to ID
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in ↵Graham Madarasz
addition to ID
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid ↵Graham Madarasz
cross-talk and fix handling of bumpy/shiny menu items
2013-05-09NORSPEC-168 separate UI handlers for spec and normal textures to avoid ↵Graham Madarasz
cross-talk and fix handling of bumpy/shiny menu items
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders ↵Graham Madarasz
loaded successfully
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders ↵Graham Madarasz
loaded successfully
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
made marker file lock use append, not truncate
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
non-deferred fullbright look
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 ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI ↵Graham Madarasz
reps consistent across layers
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
non-deferred fullbright look
2013-05-07NORSPEC-147 make repeats per meter disabled when in planar mode and make UI ↵Graham Madarasz
reps consistent across layers
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