summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparamset.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-11 14:55:33 -0500
committerDave Parks <davep@lindenlab.com>2011-10-11 14:55:33 -0500
commit2322c57b4dd2b4338eec2ca9db2425eff4bfd6d5 (patch)
treed237bc15606a154db8cede7d83cda3802d46d7a0 /indra/newview/llwlparamset.cpp
parent3211c6e3089b03d73f2e260be4037304660f834d (diff)
SH-2545 Fix for transparent water option doing nothing when shaders are enabled.
Diffstat (limited to 'indra/newview/llwlparamset.cpp')
-rw-r--r--indra/newview/llwlparamset.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llwlparamset.cpp b/indra/newview/llwlparamset.cpp
index 4a1db3d26c..5bb7025031 100644
--- a/indra/newview/llwlparamset.cpp
+++ b/indra/newview/llwlparamset.cpp
@@ -73,11 +73,13 @@ static LLFastTimer::DeclareTimer FTM_WL_PARAM_UPDATE("WL Param Update");
void LLWLParamSet::update(LLGLSLShader * shader) const
{
+ LLFastTimer t(FTM_WL_PARAM_UPDATE);
+
for(LLSD::map_const_iterator i = mParamValues.beginMap();
i != mParamValues.endMap();
++i)
{
- LLFastTimer t(FTM_WL_PARAM_UPDATE);
+
const std::string& param = i->first;