aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs9
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/ComplexObject.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
11 files changed, 27 insertions, 25 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 5322dda..1c6d363 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -630,7 +630,14 @@ namespace OpenSim.Framework
630 void SendWearables(AvatarWearable[] wearables, int serial); 630 void SendWearables(AvatarWearable[] wearables, int serial);
631 void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); 631 void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
632 void SendStartPingCheck(byte seq); 632 void SendStartPingCheck(byte seq);
633 void SendKiPrimitive(ulong regionHandle, uint localID); 633
634 /// <summary>
635 /// Tell the client that an object has been deleted
636 /// </summary>
637 /// <param name="regionHandle"></param>
638 /// <param name="localID"></param>
639 void SendKillObject(ulong regionHandle, uint localID);
640
634 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId); 641 void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
635 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 642 void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
636 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible); 643 void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 23c6df4..e1c02e9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1545,12 +1545,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1545 OutPacket(pc, ThrottleOutPacketType.Unknown); 1545 OutPacket(pc, ThrottleOutPacketType.Unknown);
1546 } 1546 }
1547 1547
1548 /// <summary> 1548 public void SendKillObject(ulong regionHandle, uint localID)
1549 /// Tell the client that an object has been deleted
1550 /// </summary>
1551 /// <param name="regionHandle"></param>
1552 /// <param name="localID"></param>
1553 public void SendKiPrimitive(ulong regionHandle, uint localID)
1554 { 1549 {
1555 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1550 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1556 // TODO: don't create new blocks if recycling an old packet 1551 // TODO: don't create new blocks if recycling an old packet
@@ -3688,7 +3683,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3688 if (part == null) 3683 if (part == null)
3689 { 3684 {
3690 // It's a ghost! tell the client to delete it from view. 3685 // It's a ghost! tell the client to delete it from view.
3691 simClient.SendKiPrimitive(Scene.RegionInfo.RegionHandle, 3686 simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
3692 localId); 3687 localId);
3693 } 3688 }
3694 else 3689 else
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
index ff9423f..edf5ec1 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
260 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles. 260 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles.
261 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup(); 261 ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup();
262 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); 262 scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor);
263 scene.SendKiPrimitive(scene.Entities[uuid].LocalId); 263 scene.SendKillObject(scene.Entities[uuid].LocalId);
264 scene.m_innerScene.DeleteSceneObject(uuid, false); 264 scene.m_innerScene.DeleteSceneObject(uuid, false);
265 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(); 265 ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup();
266 } 266 }
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index a494ff6..d6fca7b 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -189,7 +189,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
189 //This is important because we are not IN any database. 189 //This is important because we are not IN any database.
190 //m_Entity.FakeDeleteGroup(); 190 //m_Entity.FakeDeleteGroup();
191 foreach (SceneObjectPart part in m_Entity.Children.Values) 191 foreach (SceneObjectPart part in m_Entity.Children.Values)
192 client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); 192 client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
193 } 193 }
194 194
195 /// <summary> 195 /// <summary>
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
199 { 199 {
200 foreach (SceneObjectPart part in m_Entity.Children.Values) 200 foreach (SceneObjectPart part in m_Entity.Children.Values)
201 m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) 201 m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller)
202 { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } 202 { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
203 ); 203 );
204 } 204 }
205 205
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index a2d626e..35a6c2f 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -443,7 +443,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
443 443
444 } 444 }
445 445
446 public virtual void SendKiPrimitive(ulong regionHandle, uint localID) 446 public virtual void SendKillObject(ulong regionHandle, uint localID)
447 { 447 {
448 } 448 }
449 449
diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
index bbd7b70..827540d 100644
--- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
186 186
187 m_scene.ForEachClient(delegate(IClientAPI controller) 187 m_scene.ForEachClient(delegate(IClientAPI controller)
188 { 188 {
189 controller.SendKiPrimitive(m_scene.RegionInfo.RegionHandle, 189 controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
190 selectedTree.LocalId); 190 selectedTree.LocalId);
191 }); 191 });
192 192
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index b69520c..e95b1d7 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2516,7 +2516,7 @@ namespace OpenSim.Region.Environment.Scenes
2516 { 2516 {
2517 try 2517 try
2518 { 2518 {
2519 client.SendKiPrimitive(avatar.RegionHandle, avatar.LocalId); 2519 client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
2520 } 2520 }
2521 catch (NullReferenceException) 2521 catch (NullReferenceException)
2522 { 2522 {
@@ -2589,7 +2589,7 @@ namespace OpenSim.Region.Environment.Scenes
2589 2589
2590 #region Entities 2590 #region Entities
2591 2591
2592 public void SendKiPrimitive(uint localID) 2592 public void SendKillObject(uint localID)
2593 { 2593 {
2594 SceneObjectPart part = GetSceneObjectPart(localID); 2594 SceneObjectPart part = GetSceneObjectPart(localID);
2595 if (part != null) // It is a prim 2595 if (part != null) // It is a prim
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.Environment.Scenes
2600 return; 2600 return;
2601 } 2601 }
2602 } 2602 }
2603 Broadcast(delegate(IClientAPI client) { client.SendKiPrimitive(m_regionHandle, localID); }); 2603 Broadcast(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
2604 } 2604 }
2605 2605
2606 #endregion 2606 #endregion
@@ -2620,7 +2620,7 @@ namespace OpenSim.Region.Environment.Scenes
2620 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup; 2620 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
2621 m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; 2621 m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
2622 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; 2622 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
2623 m_sceneGridService.KiPrimitive += SendKiPrimitive; 2623 m_sceneGridService.KiPrimitive += SendKillObject;
2624 m_sceneGridService.OnGetLandData += GetLandData; 2624 m_sceneGridService.OnGetLandData += GetLandData;
2625 } 2625 }
2626 2626
@@ -2629,7 +2629,7 @@ namespace OpenSim.Region.Environment.Scenes
2629 /// </summary> 2629 /// </summary>
2630 public void UnRegisterRegionWithComms() 2630 public void UnRegisterRegionWithComms()
2631 { 2631 {
2632 m_sceneGridService.KiPrimitive -= SendKiPrimitive; 2632 m_sceneGridService.KiPrimitive -= SendKillObject;
2633 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; 2633 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
2634 m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; 2634 m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
2635 m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup; 2635 m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2c3e767..37f3caf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -750,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
750 // 750 //
751 if (IsSelected) 751 if (IsSelected)
752 { 752 {
753 m_scene.SendKiPrimitive(m_rootPart.LocalId); 753 m_scene.SendKillObject(m_rootPart.LocalId);
754 } 754 }
755 755
756 IsSelected = false; // fudge.... 756 IsSelected = false; // fudge....
@@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Scenes
985 } 985 }
986 986
987 if (m_rootPart != null && part == m_rootPart) 987 if (m_rootPart != null && part == m_rootPart)
988 avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId); 988 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
989 } 989 }
990 } 990 }
991 991
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.Environment.Scenes
1011 } 1011 }
1012 1012
1013 if (m_rootPart != null && part == m_rootPart) 1013 if (m_rootPart != null && part == m_rootPart)
1014 avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId); 1014 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
1015 } 1015 }
1016 } 1016 }
1017 } 1017 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8120c62..963c71b 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Environment.Scenes
2068 2068
2069 CrossAttachmentsIntoNewRegion(neighbourHandle); 2069 CrossAttachmentsIntoNewRegion(neighbourHandle);
2070 2070
2071 m_scene.SendKiPrimitive(m_localId); 2071 m_scene.SendKillObject(m_localId);
2072 2072
2073 m_scene.NotifyMyCoarseLocationChange(); 2073 m_scene.NotifyMyCoarseLocationChange();
2074 // the user may change their profile information in other region, 2074 // the user may change their profile information in other region,
diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index c8c4624..3b776e7 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Examples.SimpleModule
114 { 114 {
115 m_parts.Remove(part.UUID); 115 m_parts.Remove(part.UUID);
116 116
117 remoteClient.SendKiPrimitive(m_regionHandle, part.LocalId); 117 remoteClient.SendKillObject(m_regionHandle, part.LocalId);
118 remoteClient.AddMoney(1); 118 remoteClient.AddMoney(1);
119 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 119 remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
120 } 120 }
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Examples.SimpleModule
125 { 125 {
126 m_parts.Remove(m_rootPart.UUID); 126 m_parts.Remove(m_rootPart.UUID);
127 m_scene.DeleteSceneObject(this); 127 m_scene.DeleteSceneObject(this);
128 remoteClient.SendKiPrimitive(m_regionHandle, m_rootPart.LocalId); 128 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
129 remoteClient.AddMoney(50); 129 remoteClient.AddMoney(50);
130 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 130 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
131 } 131 }
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 61791fb..88de006 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -356,7 +356,7 @@ namespace OpenSim.Region.Examples.SimpleModule
356 356
357 } 357 }
358 358
359 public virtual void SendKiPrimitive(ulong regionHandle, uint localID) 359 public virtual void SendKillObject(ulong regionHandle, uint localID)
360 { 360 {
361 } 361 }
362 362