1 files changed, 10 insertions, 26 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 06f1301..e19877c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1660,6 +1660,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //            foreach (uint id in localIDs)
 //                m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
 
+            // remove pending entities
+            lock (m_entityProps.SyncRoot)
+                m_entityProps.Remove(localIDs);
+            lock (m_entityUpdates.SyncRoot)
+                m_entityUpdates.Remove(localIDs);
+
             KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
             // TODO: don't create new blocks if recycling an old packet
             kill.ObjectData = new KillObjectPacket.ObjectDataBlock[localIDs.Count];
@@ -1671,28 +1677,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             kill.Header.Reliable = true;
             kill.Header.Zerocoded = true;
 
-            if (localIDs.Count == 1 && m_scene.GetScenePresence(localIDs[0]) != null)
-            {
-                OutPacket(kill, ThrottleOutPacketType.Task);
-            }
-            else
-            {
-                // We MUST lock for both manipulating the kill record and sending the packet, in order to avoid a race
-                // condition where a kill can be processed before an out-of-date update for the same object.
-                // ProcessEntityUpdates() also takes the m_killRecord lock.
-//                lock (m_killRecord)
-//                {
-//                    foreach (uint localID in localIDs)
-//                        m_killRecord.Add(localID);
-
-                    // The throttle queue used here must match that being used for updates.  Otherwise, there is a
-                    // chance that a kill packet put on a separate queue will be sent to the client before an existing
-                    // update packet on another queue.  Receiving updates after kills results in unowned and undeletable
-                    // scene objects in a viewer until that viewer is relogged in.
-                    OutPacket(kill, ThrottleOutPacketType.Task);
-//                }
-            }
-        }
+            OutPacket(kill, ThrottleOutPacketType.Task);
+         }
 
         /// <summary>
         /// Send information about the items contained in a folder to the client.
@@ -5328,13 +5314,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             Vector3 velocity = new Vector3(0, 0, 0);
             Vector3 acceleration = new Vector3(0, 0, 0);
             rotation.Normalize();
-            Vector3 vrot = new Vector3(rotation.X, rotation.Y, rotation.Z);
 
             data.CollisionPlane.ToBytes(objectData, 0);
             offsetPosition.ToBytes(objectData, 16);
             velocity.ToBytes(objectData, 28);
             acceleration.ToBytes(objectData, 40);
-            vrot.ToBytes(objectData, 52);
+            rotation.ToBytes(objectData, 52);
             data.AngularVelocity.ToBytes(objectData, 64);
 
             ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();
@@ -5394,8 +5379,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
             Quaternion rotation = data.RotationOffset;
             rotation.Normalize();
-            Vector3 vrot = new Vector3(rotation.X, rotation.Y, rotation.Z);
-            vrot.ToBytes(objectData, 36);
+            rotation.ToBytes(objectData, 36);
             data.AngularVelocity.ToBytes(objectData, 48);
 
             ObjectUpdatePacket.ObjectDataBlock update = new ObjectUpdatePacket.ObjectDataBlock();