git merge

1 files changed, 1 insertions, 10 deletions

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