ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-10-14 14:43:46 +00:00
parent 8ab50fe3ee
commit 3b9400bcea
11 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.
((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();
}

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.
//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);
}
/// <summary>
@@ -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); }
);
}

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)
{
controller.SendKiPrimitive(m_scene.RegionInfo.RegionHandle,
controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
selectedTree.LocalId);
});