From 3b9400bceaa9389489951b31322204bb26cab076 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 14 Oct 2008 14:43:46 +0000 Subject: [PATCH] * refactor: rename SendKiPrimitive to SendKillObject since this appears more descriptive of what it actually does --- OpenSim/Framework/IClientAPI.cs | 9 ++++++++- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 ++------- .../Modules/ContentManagementSystem/CMModel.cs | 2 +- .../Modules/ContentManagementSystem/MetaEntity.cs | 4 ++-- .../Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 +- .../Modules/World/TreePopulator/TreePopulatorModule.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.cs | 10 +++++----- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 6 +++--- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +- OpenSim/Region/Examples/SimpleModule/ComplexObject.cs | 4 ++-- OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 2 +- 11 files changed, 27 insertions(+), 25 deletions(-) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 5322dda9a2..1c6d363d2a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -630,7 +630,14 @@ namespace OpenSim.Framework void SendWearables(AvatarWearable[] wearables, int serial); void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); void SendStartPingCheck(byte seq); - void SendKiPrimitive(ulong regionHandle, uint localID); + + /// + /// Tell the client that an object has been deleted + /// + /// + /// + void SendKillObject(ulong regionHandle, uint localID); + void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId); void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); 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 23c6df47e3..e1c02e913d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -1545,12 +1545,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(pc, ThrottleOutPacketType.Unknown); } - /// - /// Tell the client that an object has been deleted - /// - /// - /// - public void SendKiPrimitive(ulong regionHandle, uint localID) + public void SendKillObject(ulong regionHandle, uint localID) { KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); // TODO: don't create new blocks if recycling an old packet @@ -3688,7 +3683,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (part == null) { // It's a ghost! tell the client to delete it from view. - simClient.SendKiPrimitive(Scene.RegionInfo.RegionHandle, + simClient.SendKillObject(Scene.RegionInfo.RegionHandle, localId); } else diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs index ff9423f86d..edf5ec1322 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 // I thought that the DeleteGroup() function would handle all of this, but it doesn't. I'm not sure WHAT it handles. ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup(); scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); - scene.SendKiPrimitive(scene.Entities[uuid].LocalId); + scene.SendKillObject(scene.Entities[uuid].LocalId); scene.m_innerScene.DeleteSceneObject(uuid, false); ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(); } diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs index a494ff67cc..d6fca7b6db 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 //This is important because we are not IN any database. //m_Entity.FakeDeleteGroup(); foreach (SceneObjectPart part in m_Entity.Children.Values) - client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); + client.SendKillObject(m_Entity.RegionHandle, part.LocalId); } /// @@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement { foreach (SceneObjectPart part in m_Entity.Children.Values) m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) - { controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } + { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); } ); } diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index a2d626e82c..35a6c2ff72 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 } - public virtual void SendKiPrimitive(ulong regionHandle, uint localID) + public virtual void SendKillObject(ulong regionHandle, uint localID) { } diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index bbd7b7077b..827540d503 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 m_scene.ForEachClient(delegate(IClientAPI controller) { - controller.SendKiPrimitive(m_scene.RegionInfo.RegionHandle, + controller.SendKillObject(m_scene.RegionInfo.RegionHandle, selectedTree.LocalId); }); diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index b69520c458..e95b1d7a28 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -2516,7 +2516,7 @@ namespace OpenSim.Region.Environment.Scenes { try { - client.SendKiPrimitive(avatar.RegionHandle, avatar.LocalId); + client.SendKillObject(avatar.RegionHandle, avatar.LocalId); } catch (NullReferenceException) { @@ -2589,7 +2589,7 @@ namespace OpenSim.Region.Environment.Scenes #region Entities - public void SendKiPrimitive(uint localID) + public void SendKillObject(uint localID) { SceneObjectPart part = GetSceneObjectPart(localID); if (part != null) // It is a prim @@ -2600,7 +2600,7 @@ namespace OpenSim.Region.Environment.Scenes return; } } - Broadcast(delegate(IClientAPI client) { client.SendKiPrimitive(m_regionHandle, localID); }); + Broadcast(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); }); } #endregion @@ -2620,7 +2620,7 @@ namespace OpenSim.Region.Environment.Scenes m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup; m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; - m_sceneGridService.KiPrimitive += SendKiPrimitive; + m_sceneGridService.KiPrimitive += SendKillObject; m_sceneGridService.OnGetLandData += GetLandData; } @@ -2629,7 +2629,7 @@ namespace OpenSim.Region.Environment.Scenes /// public void UnRegisterRegionWithComms() { - m_sceneGridService.KiPrimitive -= SendKiPrimitive; + m_sceneGridService.KiPrimitive -= SendKillObject; m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 2c3e76789e..37f3cafd4b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -750,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes // if (IsSelected) { - m_scene.SendKiPrimitive(m_rootPart.LocalId); + m_scene.SendKillObject(m_rootPart.LocalId); } IsSelected = false; // fudge.... @@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Scenes } if (m_rootPart != null && part == m_rootPart) - avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId); + avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId); } } @@ -1011,7 +1011,7 @@ namespace OpenSim.Region.Environment.Scenes } if (m_rootPart != null && part == m_rootPart) - avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId); + avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId); } } } diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 8120c62591..963c71bb1a 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Environment.Scenes CrossAttachmentsIntoNewRegion(neighbourHandle); - m_scene.SendKiPrimitive(m_localId); + m_scene.SendKillObject(m_localId); m_scene.NotifyMyCoarseLocationChange(); // 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 c8c46249c8..3b776e7612 100644 --- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs +++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.Examples.SimpleModule { m_parts.Remove(part.UUID); - remoteClient.SendKiPrimitive(m_regionHandle, part.LocalId); + remoteClient.SendKillObject(m_regionHandle, part.LocalId); remoteClient.AddMoney(1); remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); } @@ -125,7 +125,7 @@ namespace OpenSim.Region.Examples.SimpleModule { m_parts.Remove(m_rootPart.UUID); m_scene.DeleteSceneObject(this); - remoteClient.SendKiPrimitive(m_regionHandle, m_rootPart.LocalId); + remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId); remoteClient.AddMoney(50); remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); } diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 61791fb1a7..88de006b1b 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -356,7 +356,7 @@ namespace OpenSim.Region.Examples.SimpleModule } - public virtual void SendKiPrimitive(ulong regionHandle, uint localID) + public virtual void SendKillObject(ulong regionHandle, uint localID) { }