diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-04-30 19:50:05 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-30 19:50:05 -0700 |
commit | 806d09b1143894ad66cea2c228f467e8c39a8adf (patch) | |
tree | 512bfa5d5a8fe92ac4616fd9169e1c458b0e8b87 /indra/newview/llwaterparamset.cpp | |
parent | b06ec66a5d11628905da256e084d0036f39ba529 (diff) |
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/newview/llwaterparamset.cpp')
-rw-r--r-- | indra/newview/llwaterparamset.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llwaterparamset.cpp b/indra/newview/llwaterparamset.cpp index 39d366b023..9cc91d2246 100644 --- 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) { |