From 696df33e5c163956e2f54e2223091dd681cfe7f6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Jun 2014 21:47:34 +0100
Subject: In materials module, if a texture entry somehow has no default entry
then don't try to extract materials data rather than throw an exception
---
OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index afb788b..5202bbc 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -216,7 +216,8 @@ namespace OpenSim.Region.OptionalModules.Materials
GetLegacyStoredMaterialsInPart(part);
- GetStoredMaterialInFace(part, te.DefaultTexture);
+ if (te.DefaultTexture != null)
+ GetStoredMaterialInFace(part, te.DefaultTexture);
foreach (Primitive.TextureEntryFace face in te.FaceTextures)
{
--
cgit v1.1