diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-16 17:17:01 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-16 17:17:01 +0300 |
| commit | cccca566bd2365c88cca819729c5432af9dfa52f (patch) | |
| tree | 8d81a737b1c6bf087a4d7330f1948155f554fcf2 /indra/newview/llfloaterwindlight.cpp | |
| parent | 0d7ea0e5abb4df0a18f1d8b73cce81dc2070afad (diff) | |
STORM-1245 WIP Reimplementing management of local presets according to the new spec.
User environment preferences are now persistent.
TODO: Implement applying region env. settings.
Diffstat (limited to 'indra/newview/llfloaterwindlight.cpp')
| -rw-r--r-- | indra/newview/llfloaterwindlight.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index 34629ec5c4..b90f576555 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -89,7 +89,8 @@ BOOL LLFloaterWindLight::postBuild() comboBox->add(LLStringUtil::null); // set defaults on combo boxes - comboBox->selectByValue(LLSD("Default")); + LLEnvManagerNew& env_mgr = LLEnvManagerNew::instance(); + comboBox->selectByValue(env_mgr.getUseFixedSky() ? env_mgr.getSkyPresetName() : LLStringUtil::null); } // add the list of presets @@ -920,7 +921,11 @@ void LLFloaterWindLight::onChangePresetName(LLUICtrl* ctrl) return; } +#if 0 LLWLParamManager::getInstance()->loadPreset(LLWLParamKey(combo_box->getSelectedValue())); +#else + LLEnvManagerNew::instance().setUseSkyPreset(LLWLParamKey(combo_box->getSelectedValue()).name); +#endif sWindLight->syncMenu(); } |