diff options
| author | Cho <cho@lindenlab.com> | 2013-11-12 20:07:54 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-11-12 20:07:54 +0000 |
| commit | 9946965c4decd59793adcaa39c70dbf9778d61dd (patch) | |
| tree | 9bed4e952f89826906d9918dd468d487d219183e /indra/newview | |
| parent | a718b0d182dd35bdb01973eb3108e8b4a58a627c (diff) | |
replaced Flickr and Twitter FUI icons for ACME-1181
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/commands.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/flickr.png | bin | 0 -> 15530 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/toolbar_icons/twitter.png | bin | 0 -> 16051 bytes |
4 files changed, 4 insertions, 2 deletions
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 Binary files differnew file mode 100644 index 0000000000..7fce9f0df2 --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/flickr.png diff --git a/indra/newview/skins/default/textures/toolbar_icons/twitter.png b/indra/newview/skins/default/textures/toolbar_icons/twitter.png Binary files differnew file mode 100644 index 0000000000..a99c490887 --- /dev/null +++ b/indra/newview/skins/default/textures/toolbar_icons/twitter.png |
