diff options
author | MW | 2007-06-10 13:19:48 +0000 |
---|---|---|
committer | MW | 2007-06-10 13:19:48 +0000 |
commit | ab009fe36a835fcabf0e7c553080f729f0462cac (patch) | |
tree | 26a9302337dd1d8faa2c6bbdda8da7cd4c4d227f /OpenSim | |
parent | a few bug fixes (diff) | |
download | opensim-SC_OLD-ab009fe36a835fcabf0e7c553080f729f0462cac.zip opensim-SC_OLD-ab009fe36a835fcabf0e7c553080f729f0462cac.tar.gz opensim-SC_OLD-ab009fe36a835fcabf0e7c553080f729f0462cac.tar.bz2 opensim-SC_OLD-ab009fe36a835fcabf0e7c553080f729f0462cac.tar.xz |
Another bug fix
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/OpenSim.Region/World/Primitive.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/ClientView.API.cs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Primitive.cs index be0b6ba..1f70550 100644 --- a/OpenSim/OpenSim.Region/World/Primitive.cs +++ b/OpenSim/OpenSim.Region/World/Primitive.cs | |||
@@ -270,7 +270,7 @@ namespace OpenSim.Region | |||
270 | lPos = this.Pos; | 270 | lPos = this.Pos; |
271 | } | 271 | } |
272 | 272 | ||
273 | remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005")); | 273 | remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.localid, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005")); |
274 | } | 274 | } |
275 | 275 | ||
276 | public void SendFullUpdateToAllClients() | 276 | public void SendFullUpdateToAllClients() |
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs index d9a137f..f59e170 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs | |||
@@ -421,13 +421,15 @@ namespace OpenSim | |||
421 | /// </summary> | 421 | /// </summary> |
422 | /// <param name="primData"></param> | 422 | /// <param name="primData"></param> |
423 | /// <param name="pos"></param> | 423 | /// <param name="pos"></param> |
424 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, PrimData primData, LLVector3 pos, LLUUID textureID) | 424 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID) |
425 | { | 425 | { |
426 | ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); | 426 | ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); |
427 | outPacket.RegionData.RegionHandle = regionHandle; | 427 | outPacket.RegionData.RegionHandle = regionHandle; |
428 | outPacket.RegionData.TimeDilation = timeDilation; | 428 | outPacket.RegionData.TimeDilation = timeDilation; |
429 | outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; | 429 | outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; |
430 | outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID); | 430 | outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID); |
431 | outPacket.ObjectData[0].ID = localID; | ||
432 | outPacket.ObjectData[0].FullID = primData.FullID; | ||
431 | byte[] pb = pos.GetBytes(); | 433 | byte[] pb = pos.GetBytes(); |
432 | Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); | 434 | Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); |
433 | 435 | ||