From b643ffd849f8966a2eb061678f4fa2845c2bee5d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 10 Apr 2012 17:00:47 +0200
Subject: [PATCH] Added toolbar button for region/estate tools; Icon by Whirly
 Fizzle (FIRE-5597)

---
 indra/newview/app_settings/commands.xml          |  11 +++++++++++
 .../newview/skins/default/textures/textures.xml  |   1 +
 .../default/textures/toolbar_icons/region.png    | Bin 0 -> 3386 bytes
 indra/newview/skins/default/xui/de/strings.xml   |   6 ++++++
 indra/newview/skins/default/xui/en/strings.xml   |   2 ++
 5 files changed, 20 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/region.png

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 77a2592968..c72af1b757 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -334,4 +334,15 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="stats"
            />
+
+  <command name="regioninfo"
+           available_in_toybox="true"
+           icon="regioninfo"
+           label_ref="Command_Region_Label"
+           tooltip_ref="Command_Region_Tooltip"
+           execute_function="Floater.Toggle"
+           execute_parameters="region_info"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="region_info"
+           />
 </commands>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 0a38edb392..f1bd9eabb2 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -690,6 +690,7 @@ with the same filename but different name
   <texture name="areasearch" file_name="toolbar_icons/areasearch.png" preload="true" />
   <texture name="settings_debug" file_name="toolbar_icons/settings_debug.png" preload="true" />
   <texture name="statistics" file_name="toolbar_icons/statistics.png" preload="true" />
+  <texture name="regioninfo" file_name="toolbar_icons/region.png" preload="true" />
   
   <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
   <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/region.png b/indra/newview/skins/default/textures/toolbar_icons/region.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dd05ffda809333bc54f67a9707b716a292d14c5
GIT binary patch
literal 3386
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
Q$N&HU07*qoM6N<$g5r%^$N&HU

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 850b305630..f037d281d0 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -4981,6 +4981,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Statistics_Label">
 		Statistiken
 	</string>
+	<string name="Command_Region_Label">
+		Region/Grundbesitz
+	</string>
 	<string name="Command_AboutLand_Tooltip">
 		Informationen zu dem von Ihnen besuchten Land
 	</string>
@@ -5074,6 +5077,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Statistics_Tooltip">
 		Viewer-Statistiken anzeigen
 	</string>
+	<string name="Command_Region_Tooltip">
+		Öffnet die Regions- und Grundbesitzverwaltung
+	</string>
 	<string name="Toolbar_Bottom_Tooltip">
 		gegenwärtig in der unteren Symbolleiste
 	</string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8c57374ff0..9cb8809797 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3906,6 +3906,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Areasearch_Label">Area search</string>
   <string name="Command_Settings_Debug_Label">Debug settings</string>
   <string name="Command_Statistics_Label">Statistics</string>
+  <string name="Command_Region_Label">Region/Estate</string>
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
@@ -3940,6 +3941,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Areasearch_Tooltip">Search the area for objects</string>
   <string name="Command_Settings_Debug_Tooltip">Change configuration settings of the viewer</string>
   <string name="Command_Statistics_Tooltip">Shows the viewer statistics</string>
+  <string name="Command_Region_Tooltip">Opens the region/estate tools</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>