diff options
| author | Melanie | 2010-09-11 20:22:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-11 20:22:10 +0100 |
| commit | 5e5260ad1b677f5ee85e065e0011ceb71d1c299a (patch) | |
| tree | 666999085504dca858842a603eb702bc6f36cb06 /OpenSim | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff) | |
| download | opensim-SC_OLD-5e5260ad1b677f5ee85e065e0011ceb71d1c299a.zip opensim-SC_OLD-5e5260ad1b677f5ee85e065e0011ceb71d1c299a.tar.gz opensim-SC_OLD-5e5260ad1b677f5ee85e065e0011ceb71d1c299a.tar.bz2 opensim-SC_OLD-5e5260ad1b677f5ee85e065e0011ceb71d1c299a.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 3dea40c..8a96389 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -1529,10 +1529,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 1529 | kill.Header.Reliable = true; | 1529 | kill.Header.Reliable = true; |
| 1530 | kill.Header.Zerocoded = true; | 1530 | kill.Header.Zerocoded = true; |
| 1531 | 1531 | ||
| 1532 | lock (m_entityUpdates.SyncRoot) | 1532 | if (m_scene.GetScenePresence(localID) == null) |
| 1533 | { | 1533 | { |
| 1534 | m_killRecord.Add(localID); | 1534 | lock (m_entityUpdates.SyncRoot) |
| 1535 | OutPacket(kill, ThrottleOutPacketType.State); | 1535 | { |
| 1536 | m_killRecord.Add(localID); | ||
| 1537 | OutPacket(kill, ThrottleOutPacketType.State); | ||
| 1538 | } | ||
| 1536 | } | 1539 | } |
| 1537 | } | 1540 | } |
| 1538 | 1541 | ||