summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
committerDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
commitb6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch)
tree99b5c533bcf19a4b02247e601939346b6f2151df /indra/newview/skins/default/textures
parent87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff)
parent3b7b578733867efaeb9359df69df1fe400de0f10 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/textures')
-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 41bcc62220..d76932f76d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -197,6 +197,7 @@ with the same filename but different name
<texture name="Inv_LookFolderOpen" file_name="icons/Inv_LookFolderOpen.png" preload="false" />
<texture name="Inv_LookFolderClosed" file_name="icons/Inv_LookFolderClosed.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" />
@@ -565,6 +566,8 @@ with the same filename but different name
<texture name="icon_for_sale.tga" />
<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" />