From 1cae3664a52fe48965954afc19804b11720c4add Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 20 Jan 2014 11:53:33 -0800
Subject: add null texture entry face check before converting legacy materials

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

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
index ce2a56a..c4bc8a0 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Region.OptionalModules.Materials
                         bool used = false;
 
                         foreach (var face in te.FaceTextures)
-                            if (face.MaterialID == id)
+                            if (face != null && face.MaterialID == id)
                                 used = true;
 
                         if (used)
@@ -207,7 +207,7 @@ namespace OpenSim.Region.OptionalModules.Materials
 
                             var newId = StoreMaterialAsAsset(part.CreatorID, material, part);
                             foreach (var face in te.FaceTextures)
-                                if (face.MaterialID == id)
+                                if (face != null && face.MaterialID == id)
                                     face.MaterialID = newId;
                         }
                     }
-- 
cgit v1.1