diff options
| author | Erica <erica@lindenlab.com> | 2009-10-30 15:38:59 -0700 |
|---|---|---|
| committer | Erica <erica@lindenlab.com> | 2009-10-30 15:38:59 -0700 |
| commit | 8518ac3e29ea8df5df857509aa218250eafda011 (patch) | |
| tree | 6e7c5b7ac7bbe7c225d0f31317a2906fc16b92be /indra/newview/skins/default | |
| parent | 1fbacbaa9ac002f7f5ae9a0a18ef985a8ec934c7 (diff) | |
| parent | b4ef9d2ab54dd0ba1893b38a7872b62495ea1073 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/ForSale_Badge.png | bin | 0 -> 5727 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/YouAreHere_Badge.png | bin | 0 -> 6143 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 |
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/ForSale_Badge.png b/indra/newview/skins/default/textures/icons/ForSale_Badge.png Binary files differnew file mode 100644 index 0000000000..5bee570cee --- /dev/null +++ b/indra/newview/skins/default/textures/icons/ForSale_Badge.png diff --git a/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png Binary files differnew file mode 100644 index 0000000000..c057e9743d --- /dev/null +++ b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index d2c0ab9ae2..79c70c4d8f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -93,6 +93,7 @@ <texture name="FileMenu_BarSelect" file_name="navbar/FileMenu_BarSelect.png" preload="false" scale.left="2" scale.top="0" scale.right="2" scale.bottom="0" /> <texture name="FileMenu_BG" file_name="navbar/FileMenu_BG.png" preload="false" /> + <texture name="ForSale_Badge" file_name="icons/ForSale_Badge.png" preload="false" /> <texture name="ForwardArrow_Off" file_name="icons/ForwardArrow_Off.png" preload="false" /> <texture name="ForwardArrow_Press" file_name="icons/ForwardArrow_Press.png" preload="false" /> @@ -447,6 +448,8 @@ <texture name="Window_NoTitle_Foreground" file_name="windows/Window_NoTitle_Foreground.png" preload="true" scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> + <texture name="YouAreHere_Badge" file_name="icons/YouAreHere_Badge.png" preload="false" /> + <!--WARNING OLD ART *do not use*--> <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0" /> |
