diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-16 17:17:22 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-16 17:17:22 +0300 |
| commit | 912f021bb11ef48f352ea85cca27c2bca6ca06b1 (patch) | |
| tree | 422165b7f4e2d7e3ad8a4821edc56158a0c80170 /indra/newview/llviewermenu.cpp | |
| parent | cccca566bd2365c88cca819729c5432af9dfa52f (diff) | |
STORM-1245 WIP Implement loading and applying region environment settings.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 4a0e9fa766..4acf9a1fad 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7605,7 +7605,7 @@ class LLWorldEnvSettings : public view_listener_t } else { - LLWLParamManager::getInstance()->mAnimator.activate(LLWLAnimator::TIME_LINDEN); + LLEnvManagerNew::instance().setUseDayCycle(LLEnvManagerNew::instance().getDayCycleName()); } return true; @@ -7621,8 +7621,7 @@ class LLWorldCheckEnvironment : public view_listener_t if (item == "use_region_settings") { // Check whether we're using region environment settings. - LLEnvKey::EScope cur_scope = LLEnvManager::getInstance()->getNormallyDisplayedScope(); - return cur_scope == LLEnvKey::SCOPE_REGION; + return LLEnvManagerNew::instance().getUseRegionSettings(); } return true; @@ -7637,11 +7636,8 @@ class LLWorldEnvironment : public view_listener_t if (item == "use_region_settings") { - // Toggle using region environment settings. - LLEnvManager* env_mgr = LLEnvManager::getInstance(); - LLEnvKey::EScope cur_scope = env_mgr->getNormallyDisplayedScope(); - LLEnvKey::EScope new_scope = (cur_scope == LLEnvKey::SCOPE_LOCAL ? LLEnvKey::SCOPE_REGION : LLEnvKey::SCOPE_LOCAL); - env_mgr->setNormallyDisplayedScope(new_scope); + bool cur_val = LLEnvManagerNew::instance().getUseRegionSettings(); + LLEnvManagerNew::instance().setUseRegionSettings(!cur_val); } return true; |