From 95c926b2cd8585dd5b84ad7827d21b6122ea1001 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 03:02:30 -0800
Subject: delay texture entry parsing until absolutely necessary while
 converting legacy materials

---
 OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 1b5a7a3..d8ec979 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -159,10 +159,6 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (part.DynAttrs == null)
                 return;
 
-            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
-            if (te == null)
-                return;
-
             OSD OSMaterials = null;
             OSDArray matsArr = null;
 
@@ -187,6 +183,10 @@ namespace OpenSim.Region.OptionalModules.Materials
             if (matsArr == null)
                 return;
 
+            var te = new Primitive.TextureEntry(part.Shape.TextureEntry, 0, part.Shape.TextureEntry.Length);
+            if (te == null)
+                return;
+
             foreach (OSD elemOsd in matsArr)
             {
                 if (elemOsd != null && elemOsd is OSDMap)
-- 
cgit v1.1