aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwaterparamset.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/llwaterparamset.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.zip
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.gz
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.bz2
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/newview/llwaterparamset.cpp')
-rw-r--r--linden/indra/newview/llwaterparamset.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index 4b2e426..5825a23 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -192,8 +192,6 @@ LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error)
192LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) 192LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error)
193{ 193{
194 // test to see if right type 194 // test to see if right type
195 int ttest;
196 ttest = mParamValues.size();
197 LLSD cur_val = mParamValues.get(paramName); 195 LLSD cur_val = mParamValues.get(paramName);
198 if (!cur_val.isArray() || cur_val.size() != 2) 196 if (!cur_val.isArray() || cur_val.size() != 2)
199 { 197 {