From 59ac792e44fef4de1da9fdf5c3be3ed164cae6cf Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 27 Apr 2010 17:11:24 -0700
Subject: * Thanks cmickeyb, for a patch that corrects an invalid construction
 of Primitive.TextureEntry (a "blank" texture should be initialized with
 UUID.Zero, not null)

---
 OpenSim/Framework/PrimitiveBaseShape.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 1208b97..4d1de22 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -236,7 +236,7 @@ namespace OpenSim.Framework
                 catch { }
 
                 m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0));
-                return new Primitive.TextureEntry(null);
+                return new Primitive.TextureEntry(UUID.Zero);
             }
 
             set { m_textureEntry = value.GetBytes(); }
-- 
cgit v1.1