diff options
author | McCabe Maxsted | 2009-10-11 08:11:27 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-11 08:11:27 -0700 |
commit | e0d0c01f62d4de08db7c08b90c9fe5a04b986f64 (patch) | |
tree | f173238749ccb0e036b923fef8ac9a0ad63cb118 /linden/indra/newview/llfloaterwater.cpp | |
parent | Added advanced water and windlight sky tabs to sky presets pulldown (diff) | |
download | meta-impy-e0d0c01f62d4de08db7c08b90c9fe5a04b986f64.zip meta-impy-e0d0c01f62d4de08db7c08b90c9fe5a04b986f64.tar.gz meta-impy-e0d0c01f62d4de08db7c08b90c9fe5a04b986f64.tar.bz2 meta-impy-e0d0c01f62d4de08db7c08b90c9fe5a04b986f64.tar.xz |
Made advanced water toggle
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterwater.cpp | 26 |
1 files changed, 19 insertions, 7 deletions
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 | } |
317 | void LLFloaterWater::show() | 317 | void 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 | ||
329 | bool LLFloaterWater::isOpen() | 341 | bool LLFloaterWater::isOpen() |