aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorTom2010-08-06 02:43:26 -0700
committerTom2010-08-06 02:43:26 -0700
commit0a004f8c449ffc07b806ef2076306f624d0d4b6e (patch)
tree380c340e5b80a82520d3f875c31988c266d8f168 /OpenSim/Region/ClientStack/LindenUDP
parentImplement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants w... (diff)
parentPrevent users from becoming stuck online. This affects only 0.7 (diff)
downloadopensim-SC-0a004f8c449ffc07b806ef2076306f624d0d4b6e.zip
opensim-SC-0a004f8c449ffc07b806ef2076306f624d0d4b6e.tar.gz
opensim-SC-0a004f8c449ffc07b806ef2076306f624d0d4b6e.tar.bz2
opensim-SC-0a004f8c449ffc07b806ef2076306f624d0d4b6e.tar.xz
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.cs9
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