aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2007-07-18 20:29:06 +0000
committerMW2007-07-18 20:29:06 +0000
commitd2b459b8e592b48edbdd03a154dcaa7336d5ce8d (patch)
tree6431743dd3a7962ce22f788b15b869c6222b1ebe /OpenSim/Region/ClientStack
parentMore testing some ideas, to find best method for SceneObject Primitive classes. (diff)
downloadopensim-SC_OLD-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.zip
opensim-SC_OLD-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.tar.gz
opensim-SC_OLD-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.tar.bz2
opensim-SC_OLD-d2b459b8e592b48edbdd03a154dcaa7336d5ce8d.tar.xz
Sculpted Prims should now work.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs9
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 54ddd97..440f583 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.ClientStack
59 public event ObjectDuplicate OnObjectDuplicate; 59 public event ObjectDuplicate OnObjectDuplicate;
60 public event MoveObject OnGrapUpdate; 60 public event MoveObject OnGrapUpdate;
61 public event AddNewPrim OnAddPrim; 61 public event AddNewPrim OnAddPrim;
62 public event ObjectExtraParams OnUpdateExtraParams;
62 public event UpdateShape OnUpdatePrimShape; 63 public event UpdateShape OnUpdatePrimShape;
63 public event ObjectSelect OnObjectSelect; 64 public event ObjectSelect OnObjectSelect;
64 public event ObjectDeselect OnObjectDeselect; 65 public event ObjectDeselect OnObjectDeselect;
@@ -968,6 +969,7 @@ namespace OpenSim.Region.ClientStack
968 objectData.PathTaperY = primData.PathTaperY; 969 objectData.PathTaperY = primData.PathTaperY;
969 objectData.PathTwist = primData.PathTwist; 970 objectData.PathTwist = primData.PathTwist;
970 objectData.PathTwistBegin = primData.PathTwistBegin; 971 objectData.PathTwistBegin = primData.PathTwistBegin;
972 objectData.ExtraParams = primData.ExtraParams;
971 } 973 }
972 974
973 /// <summary> 975 /// <summary>
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 338471e..c248b29 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -218,8 +218,6 @@ namespace OpenSim.Region.ClientStack
218 if (OnAddPrim != null) 218 if (OnAddPrim != null)
219 { 219 {
220 ObjectAddPacket addPacket = (ObjectAddPacket) Pack ; 220 ObjectAddPacket addPacket = (ObjectAddPacket) Pack ;
221 Console.WriteLine(addPacket.ToString());
222
223 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 221 PrimitiveBaseShape shape = new PrimitiveBaseShape();
224 222
225 shape.PCode = addPacket.ObjectData.PCode; 223 shape.PCode = addPacket.ObjectData.PCode;
@@ -258,6 +256,13 @@ namespace OpenSim.Region.ClientStack
258 } 256 }
259 } 257 }
260 break; 258 break;
259 case PacketType.ObjectExtraParams:
260 ObjectExtraParamsPacket extraPar = (ObjectExtraParamsPacket)Pack;
261 if (OnUpdateExtraParams != null)
262 {
263 OnUpdateExtraParams(extraPar.ObjectData[0].ObjectLocalID, extraPar.ObjectData[0].ParamType, extraPar.ObjectData[0].ParamInUse, extraPar.ObjectData[0].ParamData);
264 }
265 break;
261 case PacketType.ObjectDuplicate: 266 case PacketType.ObjectDuplicate:
262 ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack; 267 ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack;
263 for (int i = 0; i < dupe.ObjectData.Length; i++) 268 for (int i = 0; i < dupe.ObjectData.Length; i++)