1 files changed, 44 insertions, 36 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index b88f162..4d1de22 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -186,40 +186,44 @@ namespace OpenSim.Framework
             PCode = (byte)PCodeEnum.Primitive;
             ExtraParams = new byte[1];
             m_textureEntry = DEFAULT_TEXTURE;
-        }

-

-        public PrimitiveBaseShape(Primitive prim)

-        {

-            PCode = (byte)prim.PrimData.PCode;

-            ExtraParams = new byte[1];

-

-            State = prim.PrimData.State;

-            PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);

-            PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd);

-            PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX);

-            PathScaleY = Primitive.PackPathScale(prim.PrimData.PathScaleY);

-            PathShearX = (byte)Primitive.PackPathShear(prim.PrimData.PathShearX);

-            PathShearY = (byte)Primitive.PackPathShear(prim.PrimData.PathShearY);

-            PathSkew = Primitive.PackPathTwist(prim.PrimData.PathSkew);

-            ProfileBegin = Primitive.PackBeginCut(prim.PrimData.ProfileBegin);

-            ProfileEnd = Primitive.PackEndCut(prim.PrimData.ProfileEnd);

-            Scale = prim.Scale;

-            PathCurve = (byte)prim.PrimData.PathCurve;

-            ProfileCurve = (byte)prim.PrimData.ProfileCurve;

-            ProfileHollow = Primitive.PackProfileHollow(prim.PrimData.ProfileHollow);

-            PathRadiusOffset = Primitive.PackPathTwist(prim.PrimData.PathRadiusOffset);

-            PathRevolutions = Primitive.PackPathRevolutions(prim.PrimData.PathRevolutions);

-            PathTaperX = Primitive.PackPathTaper(prim.PrimData.PathTaperX);

-            PathTaperY = Primitive.PackPathTaper(prim.PrimData.PathTaperY);

-            PathTwist = Primitive.PackPathTwist(prim.PrimData.PathTwist);

-            PathTwistBegin = Primitive.PackPathTwist(prim.PrimData.PathTwistBegin);

-

-            m_textureEntry = prim.Textures.GetBytes();

-

-            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);

-            SculptData = prim.Sculpt.GetBytes();

-            SculptTexture = prim.Sculpt.SculptTexture;

-            SculptType = (byte)prim.Sculpt.Type;

+        }
+
+        /// <summary>
+        /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object
+        /// </summary>
+        /// <param name="prim"></param>
+        public PrimitiveBaseShape(Primitive prim)
+        {
+            PCode = (byte)prim.PrimData.PCode;
+            ExtraParams = new byte[1];
+
+            State = prim.PrimData.State;
+            PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);
+            PathEnd = Primitive.PackEndCut(prim.PrimData.PathEnd);
+            PathScaleX = Primitive.PackPathScale(prim.PrimData.PathScaleX);
+            PathScaleY = Primitive.PackPathScale(prim.PrimData.PathScaleY);
+            PathShearX = (byte)Primitive.PackPathShear(prim.PrimData.PathShearX);
+            PathShearY = (byte)Primitive.PackPathShear(prim.PrimData.PathShearY);
+            PathSkew = Primitive.PackPathTwist(prim.PrimData.PathSkew);
+            ProfileBegin = Primitive.PackBeginCut(prim.PrimData.ProfileBegin);
+            ProfileEnd = Primitive.PackEndCut(prim.PrimData.ProfileEnd);
+            Scale = prim.Scale;
+            PathCurve = (byte)prim.PrimData.PathCurve;
+            ProfileCurve = (byte)prim.PrimData.ProfileCurve;
+            ProfileHollow = Primitive.PackProfileHollow(prim.PrimData.ProfileHollow);
+            PathRadiusOffset = Primitive.PackPathTwist(prim.PrimData.PathRadiusOffset);
+            PathRevolutions = Primitive.PackPathRevolutions(prim.PrimData.PathRevolutions);
+            PathTaperX = Primitive.PackPathTaper(prim.PrimData.PathTaperX);
+            PathTaperY = Primitive.PackPathTaper(prim.PrimData.PathTaperY);
+            PathTwist = Primitive.PackPathTwist(prim.PrimData.PathTwist);
+            PathTwistBegin = Primitive.PackPathTwist(prim.PrimData.PathTwistBegin);
+
+            m_textureEntry = prim.Textures.GetBytes();
+
+            SculptEntry = (prim.Sculpt.Type != OpenMetaverse.SculptType.None);
+            SculptData = prim.Sculpt.GetBytes();
+            SculptTexture = prim.Sculpt.SculptTexture;
+            SculptType = (byte)prim.Sculpt.Type;
         }
 
         [XmlIgnore]
@@ -227,8 +231,12 @@ namespace OpenSim.Framework
         {
             get
             {
-                //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
-                return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
+                //m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
+                try { return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); }
+                catch { }
+
+                m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0));
+                return new Primitive.TextureEntry(UUID.Zero);
             }
 
             set { m_textureEntry = value.GetBytes(); }