diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-09-20 14:29:36 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-09-20 14:29:36 -0700 |
| commit | d4d0520f38f59c4f60da098da9c2217ca6e45d65 (patch) | |
| tree | b15c3a17afb909fd0fc5db5b00b47c7c73b8bd31 /indra/newview/llwlparammanager.cpp | |
| parent | c04ceedbc3e462098eceaa233cd26f6bed79b773 (diff) | |
Cleanup inside GLSLShader for uniform mapping.
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
| -rw-r--r-- | indra/newview/llwlparammanager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 980fe96c2b..41783c8667 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -59,6 +59,8 @@ #include "curl/curl.h" #include "llstreamtools.h" +#include "llenvironment.h" + LLWLParamManager::LLWLParamManager() : //set the defaults for the controls @@ -317,8 +319,9 @@ bool LLWLParamManager::loadPreset(const std::string& path) addParamSet(key, params_data); } - //*RIDER temp code testing conversion old preset to new settings. - //LLSettingsSky::ptr_t test = LLSettingsSky::buildFromLegacyPreset(name, params_data); + //*LAPRAS temp code testing conversion old preset to new settings. + LLSettingsSky::ptr_t test = LLSettingsSky::buildFromLegacyPreset(name, params_data); + LLEnvironment::instance().addSky(test); //test->exportSettings(name); return true; |