aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-06-16 21:47:34 +0100
committerJustin Clark-Casey2014-06-17 16:44:06 +0100
commit76ee671dc6cfab94424a4be18a9b7e519e9e90fc (patch)
tree227a364c65a5c5ce2b3ebf553f5e8a2d79d3a7bc
parentBehavior change: only local users can set home in any parcel of a grid. Setti... (diff)
downloadopensim-SC_OLD-76ee671dc6cfab94424a4be18a9b7e519e9e90fc.zip
opensim-SC_OLD-76ee671dc6cfab94424a4be18a9b7e519e9e90fc.tar.gz
opensim-SC_OLD-76ee671dc6cfab94424a4be18a9b7e519e9e90fc.tar.bz2
opensim-SC_OLD-76ee671dc6cfab94424a4be18a9b7e519e9e90fc.tar.xz
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
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs3
1 files changed, 2 insertions, 1 deletions
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
216 216
217 GetLegacyStoredMaterialsInPart(part); 217 GetLegacyStoredMaterialsInPart(part);
218 218
219 GetStoredMaterialInFace(part, te.DefaultTexture); 219 if (te.DefaultTexture != null)
220 GetStoredMaterialInFace(part, te.DefaultTexture);
220 221
221 foreach (Primitive.TextureEntryFace face in te.FaceTextures) 222 foreach (Primitive.TextureEntryFace face in te.FaceTextures)
222 { 223 {