diff options
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 4ab719d..0b8b95b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3514,6 +3514,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3514 | EntityUpdate update; | 3514 | EntityUpdate update; |
3515 | while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update)) | 3515 | while (updatesThisCall < maxUpdates && m_entityUpdates.TryDequeue(out update)) |
3516 | { | 3516 | { |
3517 | // If we have sent a kill packet for this object | ||
3518 | // drop any updates on the floor | ||
3519 | if (update.Entity is SceneObjectPart) | ||
3520 | { | ||
3521 | SceneObjectPart part = (SceneObjectPart)update.Entity; | ||
3522 | if (m_killRecord.Contains(part.ParentGroup.RootPart.LocalId)) | ||
3523 | continue; | ||
3524 | } | ||
3525 | |||
3517 | ++updatesThisCall; | 3526 | ++updatesThisCall; |
3518 | 3527 | ||
3519 | #region UpdateFlags to packet type conversion | 3528 | #region UpdateFlags to packet type conversion |