summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparamset.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-06-05 19:08:35 -0700
committerRichard Linden <none@none>2013-06-05 19:08:35 -0700
commit702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch)
treefeca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/newview/llwaterparamset.cpp
parent6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff)
parente1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llwaterparamset.cpp')
-rwxr-xr-x[-rw-r--r--]indra/newview/llwaterparamset.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp
index 39d366b023..9cc91d2246 100644..100755
--- a/indra/newview/llwaterparamset.cpp
+++ b/indra/newview/llwaterparamset.cpp
@@ -185,8 +185,6 @@ LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error)
LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error)
{
// test to see if right type
- int ttest;
- ttest = mParamValues.size();
LLSD cur_val = mParamValues.get(paramName);
if (!cur_val.isArray() || cur_val.size() != 2)
{