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()
 }
 void LLFloaterWater::show()
 {
-        LLFloaterWater* water = instance();
-        water->syncMenu();
-
-        // comment in if you want the menu to rebuild each time
-        //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
-        //water->initCallbacks();
+        if (!sWaterMenu)
+        {
+                LLFloaterWater* water = instance();
+                water->syncMenu();
 
-        water->open();
+                // comment in if you want the menu to rebuild each time
+                //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
+                //water->initCallbacks();
+        }
+        else
+        {
+                if (sWaterMenu->getVisible())
+                {
+                        sWaterMenu->close();
+                }
+                else
+                {
+                        sWaterMenu->open();
+                }
+        }
 }
 
 bool LLFloaterWater::isOpen()