From 6084a7ea3eb8fff88d57ca911b9b922a2f09ccf7 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 17 Jul 2008 18:59:10 +0000
Subject: Revert "git merge"

This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.


---
 OpenSim/Framework/PrimitiveBaseShape.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index bdd9858..5657b66 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -197,7 +197,13 @@ namespace OpenSim.Framework
         {
             get { return m_textureEntry; }
 
-            set { m_textureEntry = value; }
+            set 
+            { 
+                if (value == null) 
+                    m_textureEntry = new byte[1];
+                else 
+                    m_textureEntry = value; 
+            }
         }
 
 
@@ -838,6 +844,9 @@ namespace OpenSim.Framework
 
         public void ReadInExtraParamsBytes(byte[] data)
         {
+            if (data == null)
+                return;
+
             const ushort FlexiEP = 0x10;
             const ushort LightEP = 0x20;
             const ushort SculptEP = 0x30;
-- 
cgit v1.1