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

1 files changed, 13 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4615e7a..4088746 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -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;