aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-13 06:02:41 -0700
committerMcCabe Maxsted2009-09-13 06:02:41 -0700
commit36a295e300b21b39547dafc7c2e70c81176b1a3d (patch)
tree0c84e5af0f18ae6581c29470c4e776cb0b64a4f3
parentFixed windlight toolbar not updating windlight floater pulldown (diff)
downloadmeta-impy-36a295e300b21b39547dafc7c2e70c81176b1a3d.zip
meta-impy-36a295e300b21b39547dafc7c2e70c81176b1a3d.tar.gz
meta-impy-36a295e300b21b39547dafc7c2e70c81176b1a3d.tar.bz2
meta-impy-36a295e300b21b39547dafc7c2e70c81176b1a3d.tar.xz
Fixed windlight toolbar presets not applying when region default
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llwindlightremotectrl.cpp4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index acd81e1..0f481c6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,6 +12,11 @@
12 modified: linden/indra/newview/llwlparammanager.cpp 12 modified: linden/indra/newview/llwlparammanager.cpp
13 modified: linden/indra/newview/llwlparammanager.h 13 modified: linden/indra/newview/llwlparammanager.h
14 14
15
16 * Fixed windlight toolbar presets not applying when region default.
17
18 modified: linden/indra/newview/llwindlightremotectrl.cpp
19
15 20
162009-09-11 McCabe Maxsted <hakushakukun@gmail.com> 212009-09-11 McCabe Maxsted <hakushakukun@gmail.com>
17 22
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)
230 else 230 else
231 { 231 {
232 // Apply preset 232 // Apply preset
233 LLWLParamManager::instance()->loadPreset(selected); 233 LLWLParamManager::instance()->mAnimator.mIsRunning = false;
234 LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
235 LLWLParamManager::instance()->loadPreset(selected, true);
234 } 236 }
235 } 237 }
236} 238}