aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world/Primitive2.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim.RegionServer/world/Primitive2.cs')
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs22
1 files changed, 19 insertions, 3 deletions
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 0df3079..5e76fd1 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -45,7 +45,17 @@ namespace OpenSim.world
45 this._physActor = value; 45 this._physActor = value;
46 } 46 }
47 } 47 }
48 48 public override LLVector3 Pos
49 {
50 get
51 {
52 return base.Pos;
53 }
54 set
55 {
56 base.Pos = value;
57 }
58 }
49 #endregion 59 #endregion
50 60
51 public Primitive2(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, World world) 61 public Primitive2(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, World world)
@@ -106,6 +116,11 @@ namespace OpenSim.world
106 116
107 #region Packet handlers 117 #region Packet handlers
108 118
119 public void UpdatePosition(LLVector3 pos)
120 {
121
122 }
123
109 public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket) 124 public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
110 { 125 {
111 this.primData.PathBegin = addPacket.PathBegin; 126 this.primData.PathBegin = addPacket.PathBegin;
@@ -230,6 +245,7 @@ namespace OpenSim.world
230 245
231 #region Update viewers Methods 246 #region Update viewers Methods
232 247
248 //should change these mehtods, so that outgoing packets are sent through the avatar class
233 public void SendFullUpdateToClient(SimClient remoteClient) 249 public void SendFullUpdateToClient(SimClient remoteClient)
234 { 250 {
235 LLVector3 lPos; 251 LLVector3 lPos;
@@ -346,7 +362,7 @@ namespace OpenSim.world
346 objdata.ObjectData[47] = 63; 362 objdata.ObjectData[47] = 63;
347 } 363 }
348 364
349 protected void UpdatePacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData) 365 protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
350 { 366 {
351 objectData.OwnerID = this.primData.OwnerID; 367 objectData.OwnerID = this.primData.OwnerID;
352 objectData.PCode = this.primData.PCode; 368 objectData.PCode = this.primData.PCode;
@@ -378,7 +394,7 @@ namespace OpenSim.world
378 ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock(); 394 ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
379 this.SetDefaultPacketValues(objupdate); 395 this.SetDefaultPacketValues(objupdate);
380 objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456; 396 objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
381 this.UpdatePacketShapeData(objupdate); 397 this.SetPacketShapeData(objupdate);
382 byte[] pb = this.Pos.GetBytes(); 398 byte[] pb = this.Pos.GetBytes();
383 Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length); 399 Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length);
384 return objupdate; 400 return objupdate;