From 9946965c4decd59793adcaa39c70dbf9778d61dd Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 20:07:54 +0000
Subject: replaced Flickr and Twitter FUI icons for ACME-1181

---
 indra/newview/app_settings/commands.xml                 |   4 ++--
 indra/newview/skins/default/textures/textures.xml       |   2 ++
 .../skins/default/textures/toolbar_icons/flickr.png     | Bin 0 -> 15530 bytes
 .../skins/default/textures/toolbar_icons/twitter.png    | Bin 0 -> 16051 bytes
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/flickr.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/twitter.png

(limited to 'indra')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 6c9b67ac0b..f4e9cc0136 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -228,7 +228,7 @@
            />
   <command name="flickr"
            available_in_toybox="true"
-           icon="Command_Social_Icon"
+           icon="Command_Flickr_Icon"
            label_ref="Command_Flickr_Label"
            tooltip_ref="Command_Flickr_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
@@ -238,7 +238,7 @@
            />
   <command name="twitter"
            available_in_toybox="true"
-           icon="Command_Social_Icon"
+           icon="Command_Twitter_Icon"
            label_ref="Command_Twitter_Label"
            tooltip_ref="Command_Twitter_Tooltip"
            execute_function="Floater.ToggleOrBringToFront"
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 94c187e21a..e42743824e 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -149,6 +149,8 @@ with the same filename but different name
   <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png"      preload="true" />
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
   <texture name="Command_Social_Icon"       file_name="toolbar_icons/facebook.png"     preload="true" />
+  <texture name="Command_Flickr_Icon"       file_name="toolbar_icons/flickr.png"     preload="true" />
+  <texture name="Command_Twitter_Icon"      file_name="toolbar_icons/twitter.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" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/flickr.png b/indra/newview/skins/default/textures/toolbar_icons/flickr.png
new file mode 100644
index 0000000000..7fce9f0df2
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/flickr.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/twitter.png b/indra/newview/skins/default/textures/toolbar_icons/twitter.png
new file mode 100644
index 0000000000..a99c490887
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/twitter.png differ
-- 
cgit v1.2.3