diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llwaterparamset.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llwaterparamset.cpp')
| -rw-r--r-- | linden/indra/newview/llwaterparamset.cpp | 2 |
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) | |||
| 192 | LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) | 192 | LLVector2 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 | { |