ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Refactor: Change previous commits Object methods to SceneObject methods instead, on the basis that this is less likely to cause confusion with c#'s base object type

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-05-24 22:45:13 +00:00
parent 79eecd3d25
commit f3067ce6f9
9 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
/// Add an object into the scene that has come from storage
/// </summary>
/// <param name="sceneObject"></param>
public void AddObjectFromStorage(SceneObjectGroup sceneObject)
public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject)
{
sceneObject.RegionHandle = m_regInfo.RegionHandle;
sceneObject.SetScene(m_parentScene);
@@ -197,18 +197,18 @@ namespace OpenSim.Region.Environment.Scenes
}
sceneObject.UpdateParentIDs();
AddObject(sceneObject);
AddSceneObject(sceneObject);
}
/// <summary>
/// Add an object to the scene.
/// </summary>
/// <param name="sceneObject"></param>
public void AddObject(SceneObjectGroup sceneObject)
public void AddSceneObject(SceneObjectGroup sceneObject)
{
if (!Entities.ContainsKey(sceneObject.UUID))
{
// QuadTree.AddObject(sceneObject);
// QuadTree.AddSceneObject(sceneObject);
lock (Entities)
{
Entities.Add(sceneObject.UUID, sceneObject);
@@ -299,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter))
{
m_parentScene.RemoveObject((SceneObjectGroup)obj);
m_parentScene.RemoveSceneObject((SceneObjectGroup)obj);
m_numPrim--;
}
return;
@@ -307,6 +307,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
public void DetachObject(uint objectLocalID, IClientAPI remoteClient)
{
List<EntityBase> EntityList = GetEntities();