From 5fd14f653bcdad92768928e5d82c5bf2f44c1e50 Mon Sep 17 00:00:00 2001
From: Kadah <none@none>
Date: Sun, 9 Jan 2011 20:57:05 -0800
Subject: [PATCH] Added setting to turn on/off location info in the menu bar

---
 FIRESTORM-FEATURETABLE.txt                          |  1 +
 indra/newview/app_settings/settings.xml             | 11 +++++++++++
 indra/newview/llviewercontrol.cpp                   | 11 +++++++++++
 .../skins/default/xui/en/menu_hide_navbar.xml       | 11 +++++++++++
 .../skins/default/xui/en/panel_status_bar.xml       | 13 ++++++++++++-
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/FIRESTORM-FEATURETABLE.txt b/FIRESTORM-FEATURETABLE.txt
index 3daa2a3db4..16e5836393 100644
--- a/FIRESTORM-FEATURETABLE.txt
+++ b/FIRESTORM-FEATURETABLE.txt
@@ -35,3 +35,4 @@ Persist_Minimized	LGPL
 FirestormGrey_skin	LGPL
 TopMenu_Navbar		LGPL
 Cmd_chatbar		LGPL
+Menubar_location	LGPL
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6ffacf50b2..8d59a90d39 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12831,5 +12831,16 @@
 			<key>Value</key>
 			<integer>0</integer>
 		</map>
+		<key>ShowMenuBarLocation</key>
+		<map>
+		  <key>Comment</key>
+		  <string>Show/Hide location info in the menu bar</string>
+		  <key>Persist</key>
+		  <integer>1</integer>
+		  <key>Type</key>
+		  <string>Boolean</string>
+		  <key>Value</key>
+		  <integer>1</integer>
+		</map>
 </map>
 </llsd>
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 5978e2fc96..8e16263c0c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -71,6 +71,7 @@
 #include "llpanellogin.h"
 #include "llpaneltopinfobar.h"
 #include "llcombobox.h"
+#include "llstatusbar.h"
 
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 BOOL 				gHackGodmode = FALSE;
@@ -492,6 +493,15 @@ bool toggle_show_search_topbar(const LLSD& newvalue)
 	return true;
 }
 
+bool toggle_show_menubar_location_panel(const LLSD& newvalue)
+{
+	bool value = newvalue.asBoolean();
+
+	gStatusBar->childSetVisible("parcel_info_panel",value);
+
+	return true;
+}
+
 bool toggle_show_object_render_cost(const LLSD& newvalue)
 {
 	LLFloaterTools::sShowObjectCost = newvalue.asBoolean();
@@ -646,6 +656,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2));
 	gSavedSettings.getControl("ShowMiniLocationPanel")->getSignal()->connect(boost::bind(&toggle_show_mini_location_panel, _2));
 	gSavedSettings.getControl("ShowSearchTopBar")->getSignal()->connect(boost::bind(&toggle_show_search_topbar, _2));
+	gSavedSettings.getControl("ShowMenuBarLocation")->getSignal()->connect(boost::bind(&toggle_show_menubar_location_panel, _2));
 	gSavedSettings.getControl("ShowObjectRenderingCost")->getSignal()->connect(boost::bind(&toggle_show_object_render_cost, _2));
 	gSavedSettings.getControl("ForceShowGrid")->getSignal()->connect(boost::bind(&handleForceShowGrid, _2));
 }
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index 4f3dae047d..9057c37829 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -54,4 +54,15 @@
 				 parameter="ShowMiniLocationPanel" />
 		</menu_item_check>
 	-->
+    <menu_item_check
+         label="Show Menu Bar Location"
+         layout="topleft"
+         name="ShowMenuBarLocation">
+           <on_click
+             function="ToggleControl"
+             parameter="ShowMenuBarLocation" /> 
+             <on_check
+             function="CheckControl"
+             parameter="ShowMenuBarLocation" />
+    </menu_item_check>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index e50c00dbe0..15316da379 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -22,6 +22,16 @@
    left="0"
    width="1000" / -->
    
+   <panel
+    height="18"
+    left="500"
+    width="95"
+    top="1"
+    follows="left|top" 
+    name="parcel_info_panel" 
+    bg_visible="true"
+    background_opaque="true" 
+    bg_opaque_image="bevel_background">
    <button
     follows="left|top"
     height="16"
@@ -30,7 +40,7 @@
     image_disabled_selected="Info_Off"
     image_selected="Info_Off"
     image_unselected="Info_Off"
-    left="500"
+    left="0"
     name="place_info_btn"
     top="2"
     width="16"/>
@@ -111,6 +121,7 @@
     visible="false"
     width="35"
     />
+  </panel>
 	
     <panel.string
      name="packet_loss_tooltip">