From 36a295e300b21b39547dafc7c2e70c81176b1a3d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 13 Sep 2009 06:02:41 -0700 Subject: Fixed windlight toolbar presets not applying when region default --- ChangeLog.txt | 5 +++++ linden/indra/newview/llwindlightremotectrl.cpp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index acd81e1..0f481c6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -12,6 +12,11 @@ modified: linden/indra/newview/llwlparammanager.cpp modified: linden/indra/newview/llwlparammanager.h + + * Fixed windlight toolbar presets not applying when region default. + + modified: linden/indra/newview/llwindlightremotectrl.cpp + 2009-09-11 McCabe Maxsted diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp index d6074b1..ca411c5 100644 --- a/linden/indra/newview/llwindlightremotectrl.cpp +++ b/linden/indra/newview/llwindlightremotectrl.cpp @@ -230,7 +230,9 @@ void LLWindlightRemoteCtrl::onCommitPreset(LLUICtrl* ctrl, void* data) else { // Apply preset - LLWLParamManager::instance()->loadPreset(selected); + LLWLParamManager::instance()->mAnimator.mIsRunning = false; + LLWLParamManager::instance()->mAnimator.mUseLindenTime = false; + LLWLParamManager::instance()->loadPreset(selected, true); } } } -- cgit v1.1