summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/textures.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 11:19:51 +0000
commit44cfa948c7a8bf6786b204c35973ac879cdfc491 (patch)
treec34ec0cc9e0c73a72071463d71caa068d2af2659 /indra/newview/skins/default/textures/textures.xml
parenta4ef5e2b0d4e36aa98f2e4074f4ddd4cad3d3106 (diff)
parentfc1af768b800c890cda8ef3e8b9ee2537ca1d92a (diff)
merge.
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r--indra/newview/skins/default/textures/textures.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index b8131b2de9..7a2e40551c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -516,6 +516,7 @@ with the same filename but different name
<texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" />
<texture name="SL_Logo" file_name="icons/SL_Logo.png" preload="true" />
+ <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" />
<texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
<texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />