aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-06-16 22:20:30 +0100
committerJustin Clark-Casey2014-06-17 16:44:27 +0100
commit25757a6abb6f058435d14769966d4395be586e4f (patch)
tree578d73051aeef24b7a7463fb3a788f516d78fdee
parentIf processing a queued request fails up to the top of the stack, log the exce... (diff)
downloadopensim-SC_OLD-25757a6abb6f058435d14769966d4395be586e4f.zip
opensim-SC_OLD-25757a6abb6f058435d14769966d4395be586e4f.tar.gz
opensim-SC_OLD-25757a6abb6f058435d14769966d4395be586e4f.tar.bz2
opensim-SC_OLD-25757a6abb6f058435d14769966d4395be586e4f.tar.xz
If MaterialsModule unexpected sees a part with DefaultTexture of null, log this with a warning.
-rw-r--r--OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index 5202bbc..7b2a34d 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -218,6 +218,10 @@ namespace OpenSim.Region.OptionalModules.Materials
218 218
219 if (te.DefaultTexture != null) 219 if (te.DefaultTexture != null)
220 GetStoredMaterialInFace(part, te.DefaultTexture); 220 GetStoredMaterialInFace(part, te.DefaultTexture);
221 else
222 m_log.WarnFormat(
223 "[Materials]: Default texture for part {0} (part of object {1)) in {2} unexpectedly null. Ignoring.",
224 part.Name, part.ParentGroup.Name, m_scene.Name);
221 225
222 foreach (Primitive.TextureEntryFace face in te.FaceTextures) 226 foreach (Primitive.TextureEntryFace face in te.FaceTextures)
223 { 227 {