From 0d223368d1e96f20c55437d92a0cbf236e8665eb Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 4 Oct 2016 16:41:17 +0300
Subject: MAINT-6748 Add Report Abuse as new Toolbar entry

---
 indra/newview/app_settings/commands.xml                   |  10 ++++++++++
 indra/newview/skins/default/textures/textures.xml         |   1 +
 .../skins/default/textures/toolbar_icons/report_abuse.png | Bin 0 -> 407 bytes
 indra/newview/skins/default/xui/en/strings.xml            |   2 ++
 4 files changed, 13 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/report_abuse.png

(limited to 'indra')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index a0d3dc0f99..9bc0a7c701 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -282,4 +282,14 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="camera"
            />
+  <command name="reporter"
+           available_in_toybox="true"
+           icon="Command_Report_Abuse_Icon"
+           label_ref="Command_Report_Abuse_Label"
+           tooltip_ref="Command_Report_Abuse_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="reporter"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="reporter"
+           />
 </commands>
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 30ad0a0288..49a848a260 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -150,6 +150,7 @@ with the same filename but different name
   <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
   <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
   <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png"      preload="true" />
+  <texture name="Command_Report_Abuse_Icon" file_name="toolbar_icons/report_abuse.png" preload="true" />
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/report_abuse.png b/indra/newview/skins/default/textures/toolbar_icons/report_abuse.png
new file mode 100644
index 0000000000..d5cb6ca259
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/report_abuse.png differ
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a0a92c5293..6fedf83bed 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4037,6 +4037,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Places_Label">Places</string>
   <string name="Command_Preferences_Label">Preferences</string>
   <string name="Command_Profile_Label">Profile</string>
+  <string name="Command_Report_Abuse_Label">Report Abuse</string>
   <string name="Command_Search_Label">Search</string>
   <string name="Command_Snapshot_Label">Snapshot</string>
   <string name="Command_Speak_Label">Speak</string>
@@ -4068,6 +4069,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Places_Tooltip">Places you've saved</string>
   <string name="Command_Preferences_Tooltip">Preferences</string>
   <string name="Command_Profile_Tooltip">Edit or view your profile</string>
+  <string name="Command_Report_Abuse_Tooltip">Report Abuse</string>
   <string name="Command_Search_Tooltip">Find places, events, people</string>
   <string name="Command_Snapshot_Tooltip">Take a picture</string>
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
-- 
cgit v1.2.3