aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorUbitUmarov2015-08-19 20:38:49 +0100
committerUbitUmarov2015-08-19 20:38:49 +0100
commit9a0040d67c5af84defc6f40733bd0dd6a09450d6 (patch)
tree9cca9446a3b860617f18982c362434e959bef0fb /OpenSim/Region/ClientStack
parentanother funny bug (mine this time) (diff)
downloadopensim-SC_OLD-9a0040d67c5af84defc6f40733bd0dd6a09450d6.zip
opensim-SC_OLD-9a0040d67c5af84defc6f40733bd0dd6a09450d6.tar.gz
opensim-SC_OLD-9a0040d67c5af84defc6f40733bd0dd6a09450d6.tar.bz2
opensim-SC_OLD-9a0040d67c5af84defc6f40733bd0dd6a09450d6.tar.xz
put back entities remove from updates on SendKillObject.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 226f2a1..36c3780 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1212 1212
1213 // Send it sync, and async. It's not that much data 1213 // Send it sync, and async. It's not that much data
1214 // and it improves user experience just so much! 1214 // and it improves user experience just so much!
1215 DoSendLayerData(map); 1215// DoSendLayerData(map);
1216 } 1216 }
1217 1217
1218 /// <summary> 1218 /// <summary>
@@ -1710,6 +1710,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1710 1710
1711 public void SendKillObject(List<uint> localIDs) 1711 public void SendKillObject(List<uint> localIDs)
1712 { 1712 {
1713 // think we do need this
1714 // foreach (uint id in localIDs)
1715 // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
1716
1717 // remove pending entities
1718 lock (m_entityProps.SyncRoot)
1719 m_entityProps.Remove(localIDs);
1720 lock (m_entityUpdates.SyncRoot)
1721 m_entityUpdates.Remove(localIDs);
1722
1713 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1723 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1714 // TODO: don't create new blocks if recycling an old packet 1724 // TODO: don't create new blocks if recycling an old packet
1715 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[localIDs.Count]; 1725 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[localIDs.Count];