OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only reissue a kill if a update is for a deleted sog root part.

LSLKeyTest
UbitUmarov 2016-08-12 04:08:19 +01:00
parent c04792142f
commit 9080aaf9eb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1711,11 +1711,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendKillObject(List<uint> localIDs) public void SendKillObject(List<uint> localIDs)
{ {
// think we do need this
// foreach (uint id in localIDs) // foreach (uint id in localIDs)
// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle); // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
// remove pending entities // remove pending entities to reduce looping chances.
lock (m_entityProps.SyncRoot) lock (m_entityProps.SyncRoot)
m_entityProps.Remove(localIDs); m_entityProps.Remove(localIDs);
lock (m_entityUpdates.SyncRoot) lock (m_entityUpdates.SyncRoot)
@ -4046,7 +4045,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Don't send updates for objects that have been marked deleted. // Don't send updates for objects that have been marked deleted.
// Instead send another kill object, because the first one may have gotten // Instead send another kill object, because the first one may have gotten
// into a race condition // into a race condition
if (!m_killRecord.Contains(grp.LocalId)) if (part == grp.RootPart && !m_killRecord.Contains(grp.LocalId))
{ {
m_killRecord.Add(grp.LocalId); m_killRecord.Add(grp.LocalId);
maxUpdatesBytes -= 30; maxUpdatesBytes -= 30;