diff options
author | MW | 2007-07-18 20:29:06 +0000 |
---|---|---|
committer | MW | 2007-07-18 20:29:06 +0000 |
commit | d2b459b8e592b48edbdd03a154dcaa7336d5ce8d (patch) | |
tree | 6431743dd3a7962ce22f788b15b869c6222b1ebe /OpenSim/Framework | |
parent | More testing some ideas, to find best method for SceneObject Primitive classes. (diff) | |
download | opensim-SC-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.zip opensim-SC-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.tar.gz opensim-SC-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.tar.bz2 opensim-SC-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.tar.xz |
Sculpted Prims should now work.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/General/NullClientAPI.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/PrimitiveBaseShape.cs | 6 |
3 files changed, 8 insertions, 1 deletions
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 | |||
53 | public delegate void GenericCall7(uint localID, string message); | 53 | public delegate void GenericCall7(uint localID, string message); |
54 | 54 | ||
55 | public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); | 55 | public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); |
56 | public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data); | ||
56 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); | 57 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); |
57 | public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); | 58 | public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); |
58 | public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); | 59 | public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); |
@@ -106,6 +107,7 @@ namespace OpenSim.Framework.Interfaces | |||
106 | event MoveObject OnGrapUpdate; | 107 | event MoveObject OnGrapUpdate; |
107 | 108 | ||
108 | event UpdateShape OnUpdatePrimShape; | 109 | event UpdateShape OnUpdatePrimShape; |
110 | event ObjectExtraParams OnUpdateExtraParams; | ||
109 | event ObjectSelect OnObjectSelect; | 111 | event ObjectSelect OnObjectSelect; |
110 | event ObjectDeselect OnObjectDeselect; | 112 | event ObjectDeselect OnObjectDeselect; |
111 | event GenericCall7 OnObjectDescription; | 113 | 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 | |||
35 | public event MoveObject OnGrapUpdate; | 35 | public event MoveObject OnGrapUpdate; |
36 | 36 | ||
37 | public event UpdateShape OnUpdatePrimShape; | 37 | public event UpdateShape OnUpdatePrimShape; |
38 | public event ObjectExtraParams OnUpdateExtraParams; | ||
38 | public event ObjectSelect OnObjectSelect; | 39 | public event ObjectSelect OnObjectSelect; |
39 | public event GenericCall7 OnObjectDescription; | 40 | public event GenericCall7 OnObjectDescription; |
40 | public event GenericCall7 OnObjectName; | 41 | 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 | |||
42 | public sbyte PathTwist; | 42 | public sbyte PathTwist; |
43 | public sbyte PathTwistBegin; | 43 | public sbyte PathTwistBegin; |
44 | public byte[] TextureEntry; // a LL textureEntry in byte[] format | 44 | public byte[] TextureEntry; // a LL textureEntry in byte[] format |
45 | public byte[] ExtraParams; | ||
45 | 46 | ||
46 | public ShapeType PrimType | 47 | public ShapeType PrimType |
47 | { | 48 | { |
@@ -61,7 +62,7 @@ namespace OpenSim.Framework.Types | |||
61 | 62 | ||
62 | public PrimitiveBaseShape() | 63 | public PrimitiveBaseShape() |
63 | { | 64 | { |
64 | 65 | ExtraParams = new byte[1]; | |
65 | } | 66 | } |
66 | 67 | ||
67 | //void returns need to change of course | 68 | //void returns need to change of course |
@@ -81,6 +82,7 @@ namespace OpenSim.Framework.Types | |||
81 | public BoxShape() | 82 | public BoxShape() |
82 | { | 83 | { |
83 | type = ShapeType.Box; | 84 | type = ShapeType.Box; |
85 | ExtraParams = new byte[1]; | ||
84 | } | 86 | } |
85 | 87 | ||
86 | public static BoxShape Default | 88 | public static BoxShape Default |
@@ -111,6 +113,7 @@ namespace OpenSim.Framework.Types | |||
111 | primShape.PathTwistBegin = 0; | 113 | primShape.PathTwistBegin = 0; |
112 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); | 114 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")); |
113 | primShape.TextureEntry = ntex.ToBytes(); | 115 | primShape.TextureEntry = ntex.ToBytes(); |
116 | primShape.ExtraParams = new byte[1]; | ||
114 | 117 | ||
115 | return primShape; | 118 | return primShape; |
116 | } | 119 | } |
@@ -122,6 +125,7 @@ namespace OpenSim.Framework.Types | |||
122 | public SphereShape() | 125 | public SphereShape() |
123 | { | 126 | { |
124 | type = ShapeType.Sphere; | 127 | type = ShapeType.Sphere; |
128 | ExtraParams = new byte[1]; | ||
125 | } | 129 | } |
126 | } | 130 | } |
127 | } | 131 | } |