summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/textures.xml
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-08-31 16:37:40 -0500
committerDave Parks <davep@lindenlab.com>2010-08-31 16:37:40 -0500
commite68f9e566b5aeb5341f5adea0b8a6ccde86ee93d (patch)
tree6454bf6b303d03f89e567a6ea9cfee7c85aaa1ac /indra/newview/skins/default/textures/textures.xml
parent3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff)
parent771195865c4fb336f573025e9a7a22313bfb6cb8 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/textures/textures.xml')
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 082b37d80b..9ebb7dc76c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -208,6 +208,7 @@ with the same filename but different name
<texture name="Inv_LostClosed" file_name="icons/Inv_LostClosed.png" preload="false" />
<texture name="Inv_LostOpen" file_name="icons/Inv_LostOpen.png" preload="false" />
<texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" />
+ <texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />
<texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" />
<texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" />
<texture name="Inv_Object_Multi" file_name="icons/Inv_Object_Multi.png" preload="false" />
@@ -607,6 +608,8 @@ with the same filename but different name
<texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
<texture name="icon_top_pick.tga" />
+ <texture name="inv_folder_mesh.tga"/>
+ <texture name="inv_item_mesh.tga"/>
<texture name="lag_status_critical.tga" />
<texture name="lag_status_good.tga" />
<texture name="lag_status_warning.tga" />