aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs4
8 files changed, 11 insertions, 14 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index cfb36fe..59ce2c4 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1097,9 +1097,8 @@ namespace OpenSim.Framework
1097 /// <summary> 1097 /// <summary>
1098 /// Tell the client that an object has been deleted 1098 /// Tell the client that an object has been deleted
1099 /// </summary> 1099 /// </summary>
1100 /// <param name="regionHandle"></param>
1101 /// <param name="localID"></param> 1100 /// <param name="localID"></param>
1102 void SendKillObject(ulong regionHandle, List<uint> localID); 1101 void SendKillObject(List<uint> localID);
1103 1102
1104 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs); 1103 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
1105 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 1104 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 47dd842..e014471 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1588,7 +1588,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1588 OutPacket(pc, ThrottleOutPacketType.Unknown); 1588 OutPacket(pc, ThrottleOutPacketType.Unknown);
1589 } 1589 }
1590 1590
1591 public void SendKillObject(ulong regionHandle, List<uint> localIDs) 1591 public void SendKillObject(List<uint> localIDs)
1592 { 1592 {
1593// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); 1593// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
1594 1594
@@ -11555,8 +11555,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11555 if (part == null) 11555 if (part == null)
11556 { 11556 {
11557 // It's a ghost! tell the client to delete it from view. 11557 // It's a ghost! tell the client to delete it from view.
11558 simClient.SendKillObject(Scene.RegionInfo.RegionHandle, 11558 simClient.SendKillObject(new List<uint> { localId });
11559 new List<uint> { localId });
11560 } 11559 }
11561 else 11560 else
11562 { 11561 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 7d16635..f69ec21 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -776,7 +776,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
776 m_scene.ForEachClient( 776 m_scene.ForEachClient(
777 client => 777 client =>
778 { if (client.AgentId != so.AttachedAvatar) 778 { if (client.AgentId != so.AttachedAvatar)
779 client.SendKillObject(m_scene.RegionInfo.RegionHandle, new List<uint>() { so.LocalId }); 779 client.SendKillObject(new List<uint>() { so.LocalId });
780 }); 780 });
781 } 781 }
782 782
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2aba2dd..8cdde3f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3480,7 +3480,7 @@ namespace OpenSim.Region.Framework.Scenes
3480 delegate(IClientAPI client) 3480 delegate(IClientAPI client)
3481 { 3481 {
3482 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway 3482 //We can safely ignore null reference exceptions. It means the avatar is dead and cleaned up anyway
3483 try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); } 3483 try { client.SendKillObject(new List<uint> { avatar.LocalId }); }
3484 catch (NullReferenceException) { } 3484 catch (NullReferenceException) { }
3485 }); 3485 });
3486 } 3486 }
@@ -3560,7 +3560,8 @@ namespace OpenSim.Region.Framework.Scenes
3560 } 3560 }
3561 deleteIDs.Add(localID); 3561 deleteIDs.Add(localID);
3562 } 3562 }
3563 ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); }); 3563
3564 ForEachClient(c => c.SendKillObject(deleteIDs));
3564 } 3565 }
3565 3566
3566 #endregion 3567 #endregion
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3b2f537..38fa26a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1247,7 +1247,7 @@ namespace OpenSim.Region.Framework.Scenes
1247 if (!IsAttachment 1247 if (!IsAttachment
1248 || AttachedAvatar == sp.UUID 1248 || AttachedAvatar == sp.UUID
1249 || !HasPrivateAttachmentPoint) 1249 || !HasPrivateAttachmentPoint)
1250 sp.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId }); 1250 sp.ControllingClient.SendKillObject(new List<uint> { part.LocalId });
1251 } 1251 }
1252 } 1252 }
1253 }); 1253 });
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 3644856..384eb1f 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -950,7 +950,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
950 950
951 } 951 }
952 952
953 public void SendKillObject(ulong regionHandle, List<uint> localID) 953 public void SendKillObject(List<uint> localID)
954 { 954 {
955 955
956 } 956 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 8aae300..553443f 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -592,7 +592,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
592 592
593 } 593 }
594 594
595 public virtual void SendKillObject(ulong regionHandle, List<uint> localID) 595 public virtual void SendKillObject(List<uint> localID)
596 { 596 {
597 } 597 }
598 598
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 3f9690f..09e751a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -517,10 +517,9 @@ namespace OpenSim.Tests.Common.Mock
517 517
518 public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) 518 public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
519 { 519 {
520
521 } 520 }
522 521
523 public virtual void SendKillObject(ulong regionHandle, List<uint> localID) 522 public virtual void SendKillObject(List<uint> localID)
524 { 523 {
525 ReceivedKills.AddRange(localID); 524 ReceivedKills.AddRange(localID);
526 } 525 }
@@ -534,7 +533,6 @@ namespace OpenSim.Tests.Common.Mock
534 return new byte[0]; 533 return new byte[0];
535 } 534 }
536 535
537
538 public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) 536 public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
539 { 537 {
540 } 538 }