From 108b20b800fad1e9d8490ed18605c4257fdaf19c Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Thu, 24 Jul 2008 17:53:51 +0000
Subject: [PATCH] DEV-18322 	 current trunk viewer doesn't start

remove erroneous texture entries which were probably the result of a
mismerge.

approved by steve & james.
---
 indra/newview/skins/default/textures/textures.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 88e6dfc3fd0..9e1d9b5196d 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>
-- 
GitLab