diff options
| author | Melanie | 2010-09-11 20:22:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-11 20:24:14 +0100 |
| commit | 47a5e2633c4a5cb5e0e89e4b8ffc42bf5996c4e6 (patch) | |
| tree | 2e17c6253348f7f7dfbcac41b4fdd429e6e365e5 /OpenSim | |
| parent | All these files want to be committed. All white space junk. grr. (diff) | |
| download | opensim-SC_OLD-47a5e2633c4a5cb5e0e89e4b8ffc42bf5996c4e6.zip opensim-SC_OLD-47a5e2633c4a5cb5e0e89e4b8ffc42bf5996c4e6.tar.gz opensim-SC_OLD-47a5e2633c4a5cb5e0e89e4b8ffc42bf5996c4e6.tar.bz2 opensim-SC_OLD-47a5e2633c4a5cb5e0e89e4b8ffc42bf5996c4e6.tar.xz | |
Prevent child agents from being blacklisted in the kill record.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index cdf8cb1..a6315a9 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -1519,10 +1519,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 1519 | kill.Header.Reliable = true; | 1519 | kill.Header.Reliable = true; |
| 1520 | kill.Header.Zerocoded = true; | 1520 | kill.Header.Zerocoded = true; |
| 1521 | 1521 | ||
| 1522 | lock (m_entityUpdates.SyncRoot) | 1522 | if (m_scene.GetScenePresence(localID) == null) |
| 1523 | { | 1523 | { |
| 1524 | m_killRecord.Add(localID); | 1524 | lock (m_entityUpdates.SyncRoot) |
| 1525 | OutPacket(kill, ThrottleOutPacketType.State); | 1525 | { |
| 1526 | m_killRecord.Add(localID); | ||
| 1527 | OutPacket(kill, ThrottleOutPacketType.State); | ||
| 1528 | } | ||
| 1526 | } | 1529 | } |
| 1527 | } | 1530 | } |
| 1528 | 1531 | ||