aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwaterparammanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llwaterparammanager.cpp')
-rw-r--r--linden/indra/newview/llwaterparammanager.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index 9d0fd86..6e2b420 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -69,6 +69,7 @@
69 69
70#include "llwlparammanager.h" 70#include "llwlparammanager.h"
71#include "llwaterparamset.h" 71#include "llwaterparamset.h"
72#include "lightshare.h"
72#include "llpostprocess.h" 73#include "llpostprocess.h"
73#include "llfloaterwater.h" 74#include "llfloaterwater.h"
74 75
@@ -159,7 +160,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
159 if(propagate) 160 if(propagate)
160 { 161 {
161 getParamSet(name, mCurParams); 162 getParamSet(name, mCurParams);
162 propagateParameters(); 163 LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
163 } 164 }
164 return; 165 return;
165 } 166 }
@@ -200,21 +201,21 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
200 if(propagate) 201 if(propagate)
201 { 202 {
202 getParamSet(name, mCurParams); 203 getParamSet(name, mCurParams);
203 propagateParameters(); 204 LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
204 } 205 }
205} 206}
206 207
207bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */) 208bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
208{ 209{
209 LLSD paramsData(LLSD::emptyMap()); 210 LLSD paramsData(LLSD::emptyMap());
210 211
211 LLPointer<LLSDParser> parser = new LLSDXMLParser(); 212 LLPointer<LLSDParser> parser = new LLSDXMLParser();
212 213
213 if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE) 214 if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
214 { 215 {
215 return false; 216 return false;
216 } 217 }
217 218
218 if(check_if_real) 219 if(check_if_real)
219 { 220 {
220 static const char* expected_windlight_settings[] = { 221 static const char* expected_windlight_settings[] = {