diff options
| author | John Hurliman | 2010-09-16 17:31:24 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-16 17:31:24 -0700 |
| commit | 5321e0e69f5813b03748155193b0833f28c532ec (patch) | |
| tree | c51d4cc760056928e97a56b09b170259b0b9e5fd /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA... (diff) | |
| parent | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} (diff) | |
| download | opensim-SC-5321e0e69f5813b03748155193b0833f28c532ec.zip opensim-SC-5321e0e69f5813b03748155193b0833f28c532ec.tar.gz opensim-SC-5321e0e69f5813b03748155193b0833f28c532ec.tar.bz2 opensim-SC-5321e0e69f5813b03748155193b0833f28c532ec.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2163c12..cede050 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -1523,7 +1523,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 1523 | lock (m_entityUpdates.SyncRoot) | 1523 | lock (m_entityUpdates.SyncRoot) |
| 1524 | { | 1524 | { |
| 1525 | m_killRecord.Add(localID); | 1525 | m_killRecord.Add(localID); |
| 1526 | OutPacket(kill, ThrottleOutPacketType.State); | 1526 | |
| 1527 | // The throttle queue used here must match that being used for updates. Otherwise, there is a | ||
| 1528 | // chance that a kill packet put on a separate queue will be sent to the client before an existing | ||
| 1529 | // update packet on another queue. Receiving updates after kills results in unowned and undeletable | ||
| 1530 | // scene objects in a viewer until that viewer is relogged in. | ||
| 1531 | OutPacket(kill, ThrottleOutPacketType.Task); | ||
| 1527 | } | 1532 | } |
| 1528 | } | 1533 | } |
| 1529 | } | 1534 | } |