diff options
author | andreykproductengine <akleshchev@productengine.com> | 2017-04-25 17:48:34 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2017-04-25 17:48:34 +0300 |
commit | 0dcb423cf3dc42e11621eece972801b036657e91 (patch) | |
tree | 88b0493918f6340d2e038b9cc0cde1cad6f493ff /indra/newview/lldaycyclemanager.cpp | |
parent | 288f93c7e0aa605464ddb09a3cdca504c0805c48 (diff) |
MAINT-7145 Eliminate LLSingleton circular references
Diffstat (limited to 'indra/newview/lldaycyclemanager.cpp')
-rw-r--r-- | indra/newview/lldaycyclemanager.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/indra/newview/lldaycyclemanager.cpp b/indra/newview/lldaycyclemanager.cpp index e7bf989850..803e2b2fb2 100644 --- a/indra/newview/lldaycyclemanager.cpp +++ b/indra/newview/lldaycyclemanager.cpp @@ -163,28 +163,6 @@ void LLDayCycleManager::initSingleton() { LL_DEBUGS("Windlight") << "Loading all day cycles" << LL_ENDL; loadAllPresets(); - - // presets loaded, can set params - if (LLEnvManagerNew::instance().getUseDayCycle()) - { - LLSD params; - std::string preferred_day = LLEnvManagerNew::getInstance()->getDayCycleName(); - if (getPreset(preferred_day, params)) - { - // Same as through useDayCycle(), but it will call LLDayCycleManager and we are initializing - // so no need to cycle - LLWLParamManager::getInstance()->applyDayCycleParams(params, LLEnvKey::SCOPE_LOCAL); - } - else - { - LL_WARNS() << "No day cycle named " << preferred_day << ", reverting LLWLParamManager to defaults" << LL_ENDL; - LLWLParamManager::getInstance()->setDefaultDay(); - } - } - else - { - LLWLParamManager::getInstance()->setDefaultDay(); - } } void LLDayCycleManager::loadAllPresets() |