From ff01376fbe48d8265ba1f56a34e9934595a9699b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 12 Nov 2010 21:21:22 -0700
Subject: Fixed View > Web Browser sometimes loading the external browser and
 made it a menu item check rather than a call

---
 linden/indra/newview/llviewermenu.cpp                       | 13 ++++++++++++-
 .../indra/newview/skins/default/xui/en-us/menu_viewer.xml   |  5 +++--
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b81a2a2..7f00382 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6093,7 +6093,14 @@ class LLShowFloater : public view_listener_t
 		}
 		else if (floater_name == "inworld browser")
 		{
-			LLWeb::loadURL(gSavedSettings.getString("BrowserHome"));
+			if (LLFloaterMediaBrowser::instanceVisible())
+			{
+				LLFloaterMediaBrowser::getInstance()->close();
+			}
+			else
+			{
+				LLWeb::loadURLInternal(gSavedSettings.getString("BrowserHome"));
+			}
 		}
 		else if (floater_name == "beacons")
 		{
@@ -6163,6 +6170,10 @@ class LLFloaterVisible : public view_listener_t
 			LLInventoryView* iv = LLInventoryView::getActiveInventory(); 
 			new_value = (NULL != iv && TRUE == iv->getVisible());
 		}
+		else if (floater_name == "inworld browser")
+		{
+			new_value = LLFloaterMediaBrowser::instanceVisible();
+		}
 		else if (floater_name == "areasearch")
 		{
 			JCFloaterAreaSearch* instn = JCFloaterAreaSearch::getInstance();
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 53e9e2d..268ae2b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -311,10 +311,11 @@
       <on_enable function="View.EnableLastChatter" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Web Browser" label="Web Browser"
+    <menu_item_check name="Web Browser" label="Web Browser"
                     shortcut="control|B">
       <on_click function="ShowFloater" userdata="inworld browser" />
-    </menu_item_call>
+      <on_check function="FloaterVisible" userdata="inworld browser" />
+    </menu_item_check>
     <menu_item_separator />
     <menu_item_check name="Toolbar" label="Toolbar">
       <on_click function="ShowFloater" userdata="toolbar" />
-- 
cgit v1.1