ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Refactor: Renaming various *Entity*() methods to *Object*() methods on the basis that they all take SOG parameters to improve code readability for now

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-05-24 22:10:14 +00:00
parent 42693f3b20
commit 79eecd3d25
8 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,11 @@ namespace OpenSim.Region.Environment.Scenes
#region Entity Methods
public void AddEntityFromStorage(SceneObjectGroup sceneObject)
/// <summary>
/// Add an object into the scene that has come from storage
/// </summary>
/// <param name="sceneObject"></param>
public void AddObjectFromStorage(SceneObjectGroup sceneObject)
{
sceneObject.RegionHandle = m_regInfo.RegionHandle;
sceneObject.SetScene(m_parentScene);
@@ -192,10 +196,15 @@ namespace OpenSim.Region.Environment.Scenes
}
sceneObject.UpdateParentIDs();
AddEntity(sceneObject);
AddObject(sceneObject);
}
public void AddEntity(SceneObjectGroup sceneObject)
/// <summary>
/// Add an object to the scene.
/// </summary>
/// <param name="sceneObject"></param>
public void AddObject(SceneObjectGroup sceneObject)
{
if (!Entities.ContainsKey(sceneObject.UUID))
{
@@ -290,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter))
{
m_parentScene.RemoveEntity((SceneObjectGroup)obj);
m_parentScene.RemoveObject((SceneObjectGroup)obj);
m_numPrim--;
}
return;