aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-27 12:20:00 -0700
committerMcCabe Maxsted2009-09-27 12:20:34 -0700
commita790c3805601bf5cacd9359a4f303376076013d7 (patch)
treead3a263b2a495319a4874e9acf9c21d112fa09a2
parentAdded select Torley Windlight presets to Imprudence (presets good for photogr... (diff)
downloadmeta-impy-a790c3805601bf5cacd9359a4f303376076013d7.zip
meta-impy-a790c3805601bf5cacd9359a4f303376076013d7.tar.gz
meta-impy-a790c3805601bf5cacd9359a4f303376076013d7.tar.bz2
meta-impy-a790c3805601bf5cacd9359a4f303376076013d7.tar.xz
Made the windlight floater toggle
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloaterwindlight.cpp19
2 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 61817a3..e16f4f9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,6 +12,11 @@
12 12
132009-09-26 McCabe Maxsted <hakushakukun@gmail.com> 132009-09-26 McCabe Maxsted <hakushakukun@gmail.com>
14 14
15 * Made the windlight floater toggle.
16
17 modified: linden/indra/newview/llfloaterwindlight.cpp
18
19
15 * Added select Torley Windlight presets to Imprudence. 20 * Added select Torley Windlight presets to Imprudence.
16 Presets good for photography, mainly. 21 Presets good for photography, mainly.
17 22
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 9936f3b..3cbcab1 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -468,14 +468,21 @@ LLFloaterWindLight* LLFloaterWindLight::instance()
468} 468}
469void LLFloaterWindLight::show() 469void LLFloaterWindLight::show()
470{ 470{
471 LLFloaterWindLight* windLight = instance(); 471 if (!sWindLight)
472 windLight->syncMenu(); 472 {
473 LLFloaterWindLight* windLight = instance();
474 windLight->syncMenu();
473 475
474 // comment in if you want the menu to rebuild each time 476 // comment in if you want the menu to rebuild each time
475 //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml"); 477 //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml");
476 //windLight->initCallbacks(); 478 //windLight->initCallbacks();
477 479
478 windLight->open(); 480 windLight->open();
481 }
482 else
483 {
484 sWindLight->close();
485 }
479} 486}
480 487
481bool LLFloaterWindLight::isOpen() 488bool LLFloaterWindLight::isOpen()