From dbaae328e6db0e6177cfcda49dcceb45e8db8abc Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sun, 20 Mar 2011 20:30:08 -0400
Subject: [PATCH] Removed display of topmenu parcel display by default, per dev
 meeting discussion, pending it's rework to avoid overwriting other controls.

--HG--
branch : Firestorm_2.4.2
---
 indra/newview/app_settings/settings.xml                 | 2 +-
 indra/newview/llviewerwindow.cpp                        | 6 ++++++
 indra/newview/skins/default/xui/en/menu_hide_navbar.xml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 94059cf95d..b82f51c471 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13205,7 +13205,7 @@ Change of this parameter will affect the layout of buttons in notification toast
 		  <key>Type</key>
 		  <string>Boolean</string>
 		  <key>Value</key>
-		  <integer>1</integer>
+		  <integer>0</integer>
 		</map>
 		<key>UseLegacyCursors</key>
 		<map>
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 952498019f..196ceee4d6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1707,10 +1707,16 @@ void LLViewerWindow::initWorldUI()
 	{
 		navbar->showFavoritesPanel(FALSE);
 	}
+
 	if (!gSavedSettings.getBOOL("ShowSearchTopBar"))
 	{
 		navbar->childSetVisible("search_combo_box",FALSE);
 	}
+
+	if (!gSavedSettings.getBOOL("ShowMenuBarLocation"))
+	{
+		gStatusBar->childSetVisible("parcel_info_panel",FALSE);
+	}
 	
 
 	// Top Info bar
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 9057c37829..d879c8e176 100644
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
@@ -55,7 +55,7 @@
 		</menu_item_check>
 	-->
     <menu_item_check
-         label="Show Menu Bar Location"
+         label="Show Location in Top Menu"
          layout="topleft"
          name="ShowMenuBarLocation">
            <on_click