From d2b459b8e592b48edbdd03a154dcaa7336d5ce8d Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 18 Jul 2007 20:29:06 +0000
Subject: Sculpted Prims should now work.

---
 OpenSim/Framework/General/Interfaces/IClientAPI.cs    | 2 ++
 OpenSim/Framework/General/NullClientAPI.cs            | 1 +
 OpenSim/Framework/General/Types/PrimitiveBaseShape.cs | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/General')

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index c7e1901..858126b 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Framework.Interfaces
     public delegate void GenericCall7(uint localID, string message);
 
     public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
+    public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data);
     public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
     public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient);
     public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
@@ -106,6 +107,7 @@ namespace OpenSim.Framework.Interfaces
         event MoveObject OnGrapUpdate;
 
         event UpdateShape OnUpdatePrimShape;
+        event ObjectExtraParams OnUpdateExtraParams;
         event ObjectSelect OnObjectSelect;
         event ObjectDeselect OnObjectDeselect;
         event GenericCall7 OnObjectDescription;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 44bc588..a5539ef 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -35,6 +35,7 @@ namespace OpenSim.Framework
        public event MoveObject OnGrapUpdate;
 
        public event UpdateShape OnUpdatePrimShape;
+       public event ObjectExtraParams OnUpdateExtraParams;
        public event ObjectSelect OnObjectSelect;
        public event GenericCall7 OnObjectDescription;
        public event GenericCall7 OnObjectName;
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index a582209..d08c903 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework.Types
         public sbyte PathTwist;
         public sbyte PathTwistBegin;
         public byte[] TextureEntry; // a LL textureEntry in byte[] format
+        public byte[] ExtraParams;
 
         public ShapeType PrimType
         {
@@ -61,7 +62,7 @@ namespace OpenSim.Framework.Types
 
         public PrimitiveBaseShape()
         {
-
+            ExtraParams = new byte[1];
         }
 
         //void returns need to change of course
@@ -81,6 +82,7 @@ namespace OpenSim.Framework.Types
         public BoxShape()
         {
             type = ShapeType.Box;
+            ExtraParams = new byte[1];
         }
 
         public static BoxShape Default
@@ -111,6 +113,7 @@ namespace OpenSim.Framework.Types
                 primShape.PathTwistBegin = 0;
                 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
                 primShape.TextureEntry = ntex.ToBytes();
+                primShape.ExtraParams = new byte[1];
 
                 return primShape;
             }
@@ -122,6 +125,7 @@ namespace OpenSim.Framework.Types
         public SphereShape()
         {
             type = ShapeType.Sphere;
+            ExtraParams = new byte[1];
         }
     }
 }
-- 
cgit v1.1