summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llwlparammanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index 3dad7b2f4e..db81c3ead7 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -621,7 +621,7 @@ void LLWLParamManager::applyUserPrefs(bool interpolate)
{
if (env_mgr.getUseDayCycle())
{
- if (!env_mgr.useDayCycle(env_mgr.getDayCycleName(), LLEnvKey::SCOPE_LOCAL));
+ if (!env_mgr.useDayCycle(env_mgr.getDayCycleName(), LLEnvKey::SCOPE_LOCAL))
{
// *TODO: fix user prefs
applyDefaults();
@@ -647,8 +647,7 @@ void LLWLParamManager::applyUserPrefs(bool interpolate)
void LLWLParamManager::applyDefaults()
{
- LLEnvManagerNew& env_mgr = LLEnvManagerNew::instance();
- llassert(env_mgr.useDayCycle("Default", LLEnvKey::SCOPE_LOCAL) == true);
+ LLEnvManagerNew::instance().useDayCycle("Default", LLEnvKey::SCOPE_LOCAL);
}
bool LLWLParamManager::applyDayCycleParams(const LLSD& params, LLEnvKey::EScope scope, F32 time)