aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-29 00:47:31 -0700
committerMcCabe Maxsted2009-09-29 00:47:31 -0700
commit870b8777b395b2efcbfd806894b9571d19f6b777 (patch)
treea3cba89aed68504a15f5dcdaea6f04b6af391e10
parentRenamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a... (diff)
downloadmeta-impy-870b8777b395b2efcbfd806894b9571d19f6b777.zip
meta-impy-870b8777b395b2efcbfd806894b9571d19f6b777.tar.gz
meta-impy-870b8777b395b2efcbfd806894b9571d19f6b777.tar.bz2
meta-impy-870b8777b395b2efcbfd806894b9571d19f6b777.tar.xz
Fixed first windlight toolbar entry toggling Advanced Sky
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llwindlightremotectrl.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4932ebe..ff2846d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-09-28 McCabe Maxsted <hakushakukun@gmail.com> 12009-09-28 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Fixed first windlight toolbar entry toggling Advanced Sky.
4
5 modified: linden/indra/newview/llwindlightremotectrl.cpp
6
7
3 * Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge. 8 * Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge.
4 9
5 modified: linden/indra/newview/llpanelavatar.cpp 10 modified: linden/indra/newview/llpanelavatar.cpp
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 510e1df..ae9a90a 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -181,7 +181,7 @@ void LLWindlightRemoteCtrl::onCommitPreset(LLUICtrl* ctrl, void* data)
181 if (presets) 181 if (presets)
182 { 182 {
183 S32 index = presets->getFirstSelectedIndex(); 183 S32 index = presets->getFirstSelectedIndex();
184 if (index <= 0) 184 if (index < 0)
185 { 185 {
186 // Open Advanced Sky 186 // Open Advanced Sky
187 LLFloaterWindLight::show(); 187 LLFloaterWindLight::show();