summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAdam Moss <moss@lindenlab.com>2008-07-24 17:53:51 +0000
committerAdam Moss <moss@lindenlab.com>2008-07-24 17:53:51 +0000
commit108b20b800fad1e9d8490ed18605c4257fdaf19c (patch)
tree836b404a63f4060329d619b698e190195b9d1cfc /indra
parent52562e2e664c70dcd476291820ac02b893e489b8 (diff)
DEV-18322 current trunk viewer doesn't start
remove erroneous texture entries which were probably the result of a mismerge. approved by steve & james.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/skins/default/textures/textures.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 88e6dfc3fd..9e1d9b5196 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -365,10 +365,8 @@
<texture name="icn_label_music.tga"/>
<texture name="icn_label_media.tga"/>
<texture name="arrow_down.tga"/>
- <texture name="skin_thumbnail_modern.png" preload="true"/>
- <texture name="skin_thumbnail_classic.png" preload="true"/>
<texture name="cloud-particle.j2c" use_mips="true"/>
<texture name="skin_thumbnail_default.png" preload="true" />
<texture name="skin_thumbnail_silver.png" preload="true" />
-</textures> \ No newline at end of file
+</textures>