diff options
author | Merov Linden <merov@lindenlab.com> | 2013-12-03 11:53:31 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-12-03 11:53:31 -0800 |
commit | 6496e5877b0996353496101433bb9154926fef8b (patch) | |
tree | f75bf4fca9d150593e1ad3623cc26364d527e040 /indra/newview/skins/default/textures | |
parent | 542864f8ea9bb5602ac76553d76898178ad79d0f (diff) | |
parent | bf86275d78b041faffc646195bc16ecabaa3bdb7 (diff) |
Pull merge from viewer-acme
Diffstat (limited to 'indra/newview/skins/default/textures')
-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 |
3 files changed, 2 insertions, 0 deletions
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 |