aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-08-12 04:08:19 +0100
committerUbitUmarov2016-08-12 04:08:19 +0100
commit9080aaf9eba71293929627659b83ee77ee4f5d26 (patch)
treed1c2461e6134b516841c580da2ce2730e571e87a
parent partially revert commit 42a9afdc43cc.. of 06-12 not allowing more updates to... (diff)
downloadopensim-SC-9080aaf9eba71293929627659b83ee77ee4f5d26.zip
opensim-SC-9080aaf9eba71293929627659b83ee77ee4f5d26.tar.gz
opensim-SC-9080aaf9eba71293929627659b83ee77ee4f5d26.tar.bz2
opensim-SC-9080aaf9eba71293929627659b83ee77ee4f5d26.tar.xz
only reissue a kill if a update is for a deleted sog root part.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 24d92f2..2c2bcea 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1711,11 +1711,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1711 1711
1712 public void SendKillObject(List<uint> localIDs) 1712 public void SendKillObject(List<uint> localIDs)
1713 { 1713 {
1714 // think we do need this
1715 // foreach (uint id in localIDs) 1714 // foreach (uint id in localIDs)
1716 // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle); 1715 // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
1717 1716
1718 // remove pending entities 1717 // remove pending entities to reduce looping chances.
1719 lock (m_entityProps.SyncRoot) 1718 lock (m_entityProps.SyncRoot)
1720 m_entityProps.Remove(localIDs); 1719 m_entityProps.Remove(localIDs);
1721 lock (m_entityUpdates.SyncRoot) 1720 lock (m_entityUpdates.SyncRoot)
@@ -4046,7 +4045,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4046 // Don't send updates for objects that have been marked deleted. 4045 // Don't send updates for objects that have been marked deleted.
4047 // Instead send another kill object, because the first one may have gotten 4046 // Instead send another kill object, because the first one may have gotten
4048 // into a race condition 4047 // into a race condition
4049 if (!m_killRecord.Contains(grp.LocalId)) 4048 if (part == grp.RootPart && !m_killRecord.Contains(grp.LocalId))
4050 { 4049 {
4051 m_killRecord.Add(grp.LocalId); 4050 m_killRecord.Add(grp.LocalId);
4052 maxUpdatesBytes -= 30; 4051 maxUpdatesBytes -= 30;