Browse Source

Prevent child agents from being blacklisted in the kill record.

Melanie 14 years ago
parent
commit
47a5e2633c
1 changed files with 6 additions and 3 deletions
  1. 6 3
      OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

+ 6 - 3
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -1519,10 +1519,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             kill.Header.Reliable = true;
             kill.Header.Zerocoded = true;
 
-            lock (m_entityUpdates.SyncRoot)
+            if (m_scene.GetScenePresence(localID) == null)
             {
-                m_killRecord.Add(localID);
-                OutPacket(kill, ThrottleOutPacketType.State);
+                lock (m_entityUpdates.SyncRoot)
+                {
+                    m_killRecord.Add(localID);
+                    OutPacket(kill, ThrottleOutPacketType.State);
+                }
             }
         }