From b8d3a92be36078f4aa293c5e9eaa714e1a492c01 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 24 Mar 2013 16:48:33 +0100
Subject: [PATCH] Added enabled-check for physical, scripted and temporary
 objects and re-ordered the menu for the minimap

---
 .../skins/default/xui/de/menu_mini_map.xml    |  4 +-
 .../skins/default/xui/en/menu_mini_map.xml    | 67 ++++++++++---------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml
index 960516fa52..e6d9762d67 100644
--- a/indra/newview/skins/default/xui/de/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml
@@ -20,11 +20,11 @@
 	</menu>
 	<menu name="Minimap Show" label="Anzeigen">
 		<menu_item_check label="Objekte" name="Objects"/>
-		<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
-		<menu_item_check label="Land zum Verkauf" name="Parcels for Sale"/>
 		<menu_item_check label="Physikalische Objekte" name="Physical Objects"/>
 		<menu_item_check label="Skriptobjekte" name="Scripted Objects"/>
 		<menu_item_check label="Temporäre Objekte" name="Temp On Rez Objects"/>
+		<menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
+		<menu_item_check label="Land zum Verkauf" name="Parcels for Sale"/>
 		<menu_item_check label="Terrain-Texturen" name="Terrain Textures"/>
 		<menu_item_check label="Weltkarten-Texturen" name="World Map Textures"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index 54fe8cd2b7..d78c3f20df 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -124,6 +124,43 @@
       <menu_item_check.on_check
        control="MiniMapObjects" />
     </menu_item_check>
+    <menu_item_check
+     label="Physical Objects"
+     name="Physical Objects">
+      <menu_item_check.on_check
+       function="CheckControl"
+       parameter="FSNetMapPhysical" />
+      <menu_item_check.on_click
+       function="ToggleControl"
+       parameter="FSNetMapPhysical" />
+      <menu_item_check.on_enable
+       control="MiniMapObjects" />
+    </menu_item_check>
+    <menu_item_check
+	 label="Scripted Objects"
+	 name="Scripted Objects">
+      <menu_item_check.on_check
+       function="CheckControl"
+       parameter="FSNetMapScripted" />
+      <menu_item_check.on_click
+       function="ToggleControl"
+       parameter="FSNetMapScripted" />
+      <menu_item_check.on_enable
+       control="MiniMapObjects" />
+    </menu_item_check>
+    <menu_item_check
+     label="Temp On Rez Objects"
+     name="Temp On Rez Objects">
+      <menu_item_check.on_check
+       function="CheckControl"
+       parameter="FSNetMapTempOnRez" />
+      <menu_item_check.on_click
+       function="ToggleControl"
+       parameter="FSNetMapTempOnRez" />
+      <menu_item_check.on_enable
+       control="MiniMapObjects" />
+    </menu_item_check>
+    <menu_item_separator />
     <menu_item_check
      label="Property Lines"
      name="Property Lines">
@@ -144,36 +181,6 @@
       <menu_item_check.on_enable
        control="MiniMapPropertyLines" />
     </menu_item_check>
-    <menu_item_check
-     label="Physical Objects"
-     name="Physical Objects">
-      <menu_item_check.on_check
-       function="CheckControl"
-       parameter="FSNetMapPhysical" />
-      <menu_item_check.on_click
-       function="ToggleControl"
-       parameter="FSNetMapPhysical" />
-    </menu_item_check>
-    <menu_item_check
-	 label="Scripted Objects"
-	 name="Scripted Objects">
-      <menu_item_check.on_check
-       function="CheckControl"
-       parameter="FSNetMapScripted" />
-      <menu_item_check.on_click
-       function="ToggleControl"
-       parameter="FSNetMapScripted" />
-    </menu_item_check>
-    <menu_item_check
-     label="Temp On Rez Objects"
-     name="Temp On Rez Objects">
-      <menu_item_check.on_check
-       function="CheckControl"
-       parameter="FSNetMapTempOnRez" />
-      <menu_item_check.on_click
-       function="ToggleControl"
-       parameter="FSNetMapTempOnRez" />
-    </menu_item_check>
     <menu_item_separator />
     <menu_item_check
      label="Terrain Textures"