From 33eea62606908ca39ac90eb9c99b0eee3c5f39de Mon Sep 17 00:00:00 2001
From: dahlia
Date: Mon, 8 Jul 2013 17:12:39 -0700
Subject: remove an invalid null UUID check which caused a warning

---
 OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/Materials')

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 00504d0..b997d4d 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -416,14 +416,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
                                                             if (te.DefaultTexture == null)
                                                                 m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
                                                             else
-                                                            {
-                                                                if (te.DefaultTexture.MaterialID == null)
-                                                                    m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture.MaterialID is null");
-                                                                else
-                                                                {
-                                                                    te.DefaultTexture.MaterialID = id;
-                                                                }
-                                                            }
+                                                                te.DefaultTexture.MaterialID = id;
                                                         }
                                                         else
                                                         {
-- 
cgit v1.1