From f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 24 May 2008 22:45:13 +0000
Subject: * 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
---
OpenSim/Region/Environment/Scenes/InnerScene.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4088746..4885d6d 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
/// Add an object into the scene that has come from storage
///
///
- 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);
}
///
/// Add an object to the scene.
///
///
- 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 EntityList = GetEntities();
--
cgit v1.1