Revert "git merge"

This reverts commit 80e1c3742a3ba7eb9aa1686a242b36f64331095a.
2026-08-08 02:05:34 +08:00 · 2008-07-17 18:59:10 +00:00
parent dd144e12ba
commit 6084a7ea3e
4 changed files with 69 additions and 5 deletions
--- 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;