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

---
 indra/newview/app_settings/commands.xml         |   4 ++--
 .../newview/skins/default/textures/textures.xml |   2 ++
 .../default/textures/toolbar_icons/flickr.png   | Bin 0 -> 15530 bytes
 .../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

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 0000000000000000000000000000000000000000..7fce9f0df24675f2af445689467a21ec14796a54
GIT binary patch
literal 15530
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
Nne=Gt^zH+P{{aZ`=kWjl

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..a99c490887eafde50d0b4295d3bd93efafab3dda
GIT binary patch
literal 16051
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

literal 0
HcmV?d00001