summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
AgeCommit message (Collapse)Author
2013-05-23Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-23NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny ↵Dave Parks
descrepencies.
2013-05-23NORSPEC-193 NORSPEC-161 make legacy shiny a batch breaker when materials are ↵Graham Madarasz
in play
2013-05-22NORSPEC-203 fix handling of objs with materials due to alpha mode in ↵Graham Madarasz
non-deferred
2013-05-20NORSPEC-191 make alpha masked rigged faces appear with deferred rendering on ↵Graham Madarasz
and off
2013-05-20NORSPEC-188 avoid removing 'Use Texture' item when cancelling from picker ↵Graham Madarasz
back to having prev texture
2013-05-17NORSPEC-189 restore old mat param update registrationGraham Madarasz (Graham)
2013-05-16Merge beta fixesGraham Madarasz
2013-05-16NORSPEC-189 return to inefficient material update reg to avoid crashes from ↵Graham Madarasz
brundlefly solution with old reg and new callback
2013-05-15NORSPEC-119 put back TE-specific get registration in material manager ↵Graham Madarasz
stomped during 'reloading'.
2013-05-15merge up to latest integration repoOz Linden
2013-05-14NORSPEC-181 Fix for performance regression.Dave Parks
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
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-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-06Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
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
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-26Merge viewer-dev-mat and fix llvovolume.cpp missed sunshine mergesGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25merge changes for latest rendering fixesOz Linden
2013-04-25NORSPEC-67: fix update problem by not updating texture pickers when they are ↵Oz Linden
open
2013-04-25NORSPEC-118 Compatibility pass against advanced lighting disabled.Dave Parks
2013-04-24NORSPEC-146 Fix for objects with alpha mode set to none or mask being shinyDave Parks
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-16NORSPEC-127 work-around crasher by forcing simple faces into simple passGraham Madarasz
2013-04-16Merge viewer-dev-materialsGraham Madarasz (Graham Linden)
2013-04-15Merged Graham's stuff amongst others.Geenz
2013-04-15Hooked up normal and specular texture coordinates.Geenz
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-11Pass binormal masks in on particles and in lldrawpoolalphaDave Parks
2013-04-11First pass on alpha blended materialsGeenz
2013-04-10Fix for mac build?Dave Parks
2013-04-10NORSPEC-75 Add appropriate draw calls to underwater render passes so objects ↵Dave Parks
with material data don't disappear in water.
2013-04-04Merged with viewer-dev-materialsGraham Madarasz (Graham Linden)
2013-04-03NORSPEC-23 NORSPEC-76 NORSPEC-37 and other stability improvementsGraham Madarasz (Graham Linden)