git merge

2026-08-08 02:05:34 +08:00 · 2008-07-17 18:59:06 +00:00
parent 1c0f27b013
commit dd144e12ba
4 changed files with 5 additions and 69 deletions
--- 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;