diff options
author | McCabe Maxsted | 2009-09-28 22:19:21 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-28 22:19:21 -0700 |
commit | e3333361557638d27ba4d717201dd080b0850aa5 (patch) | |
tree | 8a55095b80c2a8e72b5e2a4536faeea3dffb6c9e | |
parent | Updated viewer version in Mac and Windows installer files. (diff) | |
download | meta-impy-e3333361557638d27ba4d717201dd080b0850aa5.zip meta-impy-e3333361557638d27ba4d717201dd080b0850aa5.tar.gz meta-impy-e3333361557638d27ba4d717201dd080b0850aa5.tar.bz2 meta-impy-e3333361557638d27ba4d717201dd080b0850aa5.tar.xz |
Fixed Advanced Sky only toggling once
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/llfloaterwindlight.cpp | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index a1b6e53..d7e84c7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,10 @@ | |||
1 | 2009-09-28 McCabe Maxsted <hakushakukun@gmail.com> | ||
2 | |||
3 | * Fixed Advanced Sky only toggling once. | ||
4 | |||
5 | modified: linden/indra/newview/llfloaterwindlight.cpp | ||
6 | |||
7 | |||
1 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- | 8 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- |
2 | =- 1.2.0 BETA -= | 9 | =- 1.2.0 BETA -= |
3 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- | 10 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- |
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp index 3cbcab1..71e81fa 100644 --- a/linden/indra/newview/llfloaterwindlight.cpp +++ b/linden/indra/newview/llfloaterwindlight.cpp | |||
@@ -476,12 +476,17 @@ void LLFloaterWindLight::show() | |||
476 | // comment in if you want the menu to rebuild each time | 476 | // comment in if you want the menu to rebuild each time |
477 | //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml"); | 477 | //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml"); |
478 | //windLight->initCallbacks(); | 478 | //windLight->initCallbacks(); |
479 | |||
480 | windLight->open(); | ||
481 | } | 479 | } |
482 | else | 480 | else |
483 | { | 481 | { |
484 | sWindLight->close(); | 482 | if (sWindLight->getVisible()) |
483 | { | ||
484 | sWindLight->close(); | ||
485 | } | ||
486 | else | ||
487 | { | ||
488 | sWindLight->open(); | ||
489 | } | ||
485 | } | 490 | } |
486 | } | 491 | } |
487 | 492 | ||