diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llfloaterwindlight.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
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 | } |
469 | void LLFloaterWindLight::show() | 469 | void 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 | ||
481 | bool LLFloaterWindLight::isOpen() | 488 | bool LLFloaterWindLight::isOpen() |