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

* refactor: rename SendKiPrimitive to SendKillObject since this appears more descriptive of what it actually does

0.6.0-stable
Justin Clarke Casey 2008-10-14 14:43:46 +00:00
parent 8ab50fe3ee
commit 3b9400bcea
11 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/IClientAPI.cs
View File

@ -630,7 +630,14 @@ namespace OpenSim.Framework
void SendWearables(AvatarWearable[] wearables, int serial); void SendWearables(AvatarWearable[] wearables, int serial);
void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
void SendStartPingCheck(byte seq); void SendStartPingCheck(byte seq);
void SendKiPrimitive(ulong regionHandle, uint localID);
/// <summary>
/// Tell the client that an object has been deleted
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="localID"></param>
void SendKillObject(ulong regionHandle, uint localID);
void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId); void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId);
void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args); void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible); void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible);

9
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -1545,12 +1545,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(pc, ThrottleOutPacketType.Unknown); OutPacket(pc, ThrottleOutPacketType.Unknown);
} }
/// <summary> public void SendKillObject(ulong regionHandle, uint localID)
/// Tell the client that an object has been deleted
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="localID"></param>
public void SendKiPrimitive(ulong regionHandle, uint localID)
{ {
KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
// TODO: don't create new blocks if recycling an old packet // TODO: don't create new blocks if recycling an old packet
@ -3688,7 +3683,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (part == null) if (part == null)
{ {
// It's a ghost! tell the client to delete it from view. // It's a ghost! tell the client to delete it from view.
simClient.SendKiPrimitive(Scene.RegionInfo.RegionHandle, simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
localId); localId);
} }
else else

2
OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
View File

@ -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. // 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(); ((SceneObjectGroup)scene.Entities[uuid]).DetachFromBackup();
scene.PhysicsScene.RemovePrim(((SceneObjectGroup)scene.Entities[uuid]).RootPart.PhysActor); 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); scene.m_innerScene.DeleteSceneObject(uuid, false);
((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup(); ((SceneObjectGroup)scene.Entities[uuid]).DeleteGroup();
} }

4
OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
View File

@ -189,7 +189,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
//This is important because we are not IN any database. //This is important because we are not IN any database.
//m_Entity.FakeDeleteGroup(); //m_Entity.FakeDeleteGroup();
foreach (SceneObjectPart part in m_Entity.Children.Values) foreach (SceneObjectPart part in m_Entity.Children.Values)
client.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
} }
/// <summary> /// <summary>
@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
{ {
foreach (SceneObjectPart part in m_Entity.Children.Values) foreach (SceneObjectPart part in m_Entity.Children.Values)
m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller) m_Entity.Scene.ClientManager.ForEachClient(delegate(IClientAPI controller)
{ controller.SendKiPrimitive(m_Entity.RegionHandle, part.LocalId); } { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
); );
} }

2
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@ -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)
{ {
} }

2
OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
View File

@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
m_scene.ForEachClient(delegate(IClientAPI controller) m_scene.ForEachClient(delegate(IClientAPI controller)
{ {
controller.SendKiPrimitive(m_scene.RegionInfo.RegionHandle, controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
selectedTree.LocalId); selectedTree.LocalId);
}); });

10
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2516,7 +2516,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
try try
{ {
client.SendKiPrimitive(avatar.RegionHandle, avatar.LocalId); client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
} }
catch (NullReferenceException) catch (NullReferenceException)
{ {
@ -2589,7 +2589,7 @@ namespace OpenSim.Region.Environment.Scenes
#region Entities #region Entities
public void SendKiPrimitive(uint localID) public void SendKillObject(uint localID)
{ {
SceneObjectPart part = GetSceneObjectPart(localID); SceneObjectPart part = GetSceneObjectPart(localID);
if (part != null) // It is a prim if (part != null) // It is a prim
@ -2600,7 +2600,7 @@ namespace OpenSim.Region.Environment.Scenes
return; return;
} }
} }
Broadcast(delegate(IClientAPI client) { client.SendKiPrimitive(m_regionHandle, localID); }); Broadcast(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, localID); });
} }
#endregion #endregion
@ -2620,7 +2620,7 @@ namespace OpenSim.Region.Environment.Scenes
m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup; m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
m_sceneGridService.KiPrimitive += SendKiPrimitive; m_sceneGridService.KiPrimitive += SendKillObject;
m_sceneGridService.OnGetLandData += GetLandData; m_sceneGridService.OnGetLandData += GetLandData;
} }
@ -2629,7 +2629,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void UnRegisterRegionWithComms() public void UnRegisterRegionWithComms()
{ {
m_sceneGridService.KiPrimitive -= SendKiPrimitive; m_sceneGridService.KiPrimitive -= SendKillObject;
m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup; m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup;

6
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -750,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
// //
if (IsSelected) if (IsSelected)
{ {
m_scene.SendKiPrimitive(m_rootPart.LocalId); m_scene.SendKillObject(m_rootPart.LocalId);
} }
IsSelected = false; // fudge.... IsSelected = false; // fudge....
@ -985,7 +985,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
if (m_rootPart != null && part == m_rootPart) 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) if (m_rootPart != null && part == m_rootPart)
avatars[i].ControllingClient.SendKiPrimitive(m_regionHandle, part.LocalId); avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
} }
} }
} }

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Environment.Scenes
CrossAttachmentsIntoNewRegion(neighbourHandle); CrossAttachmentsIntoNewRegion(neighbourHandle);
m_scene.SendKiPrimitive(m_localId); m_scene.SendKillObject(m_localId);
m_scene.NotifyMyCoarseLocationChange(); m_scene.NotifyMyCoarseLocationChange();
// the user may change their profile information in other region, // the user may change their profile information in other region,

4
OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Region.Examples.SimpleModule
{ {
m_parts.Remove(part.UUID); m_parts.Remove(part.UUID);
remoteClient.SendKiPrimitive(m_regionHandle, part.LocalId); remoteClient.SendKillObject(m_regionHandle, part.LocalId);
remoteClient.AddMoney(1); remoteClient.AddMoney(1);
remoteClient.SendChatMessage("Poof!", 1, AbsolutePosition, "Party Party", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); 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_parts.Remove(m_rootPart.UUID);
m_scene.DeleteSceneObject(this); m_scene.DeleteSceneObject(this);
remoteClient.SendKiPrimitive(m_regionHandle, m_rootPart.LocalId); remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
remoteClient.AddMoney(50); remoteClient.AddMoney(50);
remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", UUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
} }

2
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -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)
{ {
} }