diff options
author | Merov Linden <merov@lindenlab.com> | 2013-05-06 18:40:22 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-05-06 18:40:22 -0700 |
commit | a26c7df637aea37aa5bf823f41f574d2ddd4ea70 (patch) | |
tree | aa78044ebced7f959edd2ddc483867f75bfbfe81 /indra/newview/skins/default/textures | |
parent | 00275301fc6606c98f77f8fbb8e485b3788831a8 (diff) | |
parent | 04587bdb9d5e1653d5b19a6ca51e547180994958 (diff) |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/skins/default/textures')
-rw-r--r-- | indra/newview/skins/default/textures/icons/Facebook.png | bin | 0 -> 365 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/Facebook.png b/indra/newview/skins/default/textures/icons/Facebook.png Binary files differnew file mode 100644 index 0000000000..8287d56f88 --- /dev/null +++ b/indra/newview/skins/default/textures/icons/Facebook.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 5b17ef94db..18146943a5 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -199,6 +199,8 @@ with the same filename but different name <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" /> <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" /> + <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" /> + <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" /> <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" /> <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" /> |