aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloaterwater.cpp26
2 files changed, 24 insertions, 7 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index ee9ab1f..3a82593 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-10-11 McCabe Maxsted <hakushakukun@gmail.com> 12009-10-11 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Made advanced water toggle.
4
5 modified: linden/indra/newview/llfloaterwater.cpp
6
7
3 * Added advanced water and windlight sky tabs to sky presets pulldown. 8 * Added advanced water and windlight sky tabs to sky presets pulldown.
4 9
5 modified: linden/indra/newview/llfloaterwindlight.cpp 10 modified: linden/indra/newview/llfloaterwindlight.cpp
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index d2ea74e..7e2f188 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -316,14 +316,26 @@ LLFloaterWater* LLFloaterWater::instance()
316} 316}
317void LLFloaterWater::show() 317void LLFloaterWater::show()
318{ 318{
319 LLFloaterWater* water = instance(); 319 if (!sWaterMenu)
320 water->syncMenu(); 320 {
321 321 LLFloaterWater* water = instance();
322 // comment in if you want the menu to rebuild each time 322 water->syncMenu();
323 //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
324 //water->initCallbacks();
325 323
326 water->open(); 324 // comment in if you want the menu to rebuild each time
325 //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
326 //water->initCallbacks();
327 }
328 else
329 {
330 if (sWaterMenu->getVisible())
331 {
332 sWaterMenu->close();
333 }
334 else
335 {
336 sWaterMenu->open();
337 }
338 }
327} 339}
328 340
329bool LLFloaterWater::isOpen() 341bool LLFloaterWater::isOpen()