Another bug fix

3 files changed, 5 insertions, 3 deletions

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 719c634..1bf378f 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -102,6 +102,6 @@ namespace OpenSim.Framework.Interfaces
         void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);

         AgentCircuitData RequestClientInfo();

 

-        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, PrimData primData, LLVector3 pos, LLUUID textureID);

+        void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID);

     }

 }

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
                 lPos = this.Pos;

             }

 

-            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005"));

+            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.localid, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005"));

         }

 

         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
         /// </summary>

         /// <param name="primData"></param>

         /// <param name="pos"></param>

-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, PrimData primData, LLVector3 pos, LLUUID textureID)

+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID)

         {

             ObjectUpdatePacket outPacket = new ObjectUpdatePacket();

             outPacket.RegionData.RegionHandle = regionHandle;

             outPacket.RegionData.TimeDilation = timeDilation;

             outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];

             outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID);

+            outPacket.ObjectData[0].ID = localID;

+            outPacket.ObjectData[0].FullID = primData.FullID; 

             byte[] pb = pos.GetBytes();

             Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);