summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-11-15 15:20:46 -0500
committerLogan Dethrow <log@lindenlab.com>2012-11-15 15:20:46 -0500
commit79dbaed1581a5d8212caebf6b6a3672660e2f5a9 (patch)
treec3c539a8ce3ccfb4d7d1a66b58b56fce9b5c293b /indra/newview/skins
parentf93604c399c889e06980554e1cb59a833e7f847d (diff)
parent51a016a0cc6928dd2a685ce22dd6475e2610a5c5 (diff)
Merge lindenlab/sunshine-internal -> log/sunshine-internal
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 06f8f8c670..03aedae0a9 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -712,9 +712,6 @@ 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" />