diff options
| author | Melanie Thielker | 2010-08-05 18:50:17 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-05 18:50:17 +0200 |
| commit | 8bdbcda2b70ede033c38a604af573554dd2776ad (patch) | |
| tree | 7e0045b3e8c258ee23c49d6254def831bb7c3843 /OpenSim/Region/ClientStack | |
| parent | Revert "Enforce a 0.2 second sleep on llDie() before the command is executed ... (diff) | |
| download | opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.zip opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.tar.gz opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.tar.bz2 opensim-SC_OLD-8bdbcda2b70ede033c38a604af573554dd2776ad.tar.xz | |
We already have a record of killed prims. It just wasn't used by the new
JHurlicane code anymore. Use it to prevent sending updates after kills.
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -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 |