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

2 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 8efbf27..5300750 100644
--- a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Examples.SimpleModule
             if (m_parts.Count == 1)
             {
                 m_parts.Remove(m_rootPart.UUID);
-                m_scene.RemoveEntity(this);
+                m_scene.RemoveObject(this);
                 remoteClient.SendKillObject(m_regionHandle, m_rootPart.LocalId);
                 remoteClient.AddMoney(50);
                 remoteClient.SendChatMessage("KABLAM!!!", 1, AbsolutePosition, "Groupie Groupie", LLUUID.Zero, (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully);
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 81abb3f..4129d61 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Examples.SimpleModule
                 }
 
                 FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos);
-                m_scene.AddEntity(fileObject);
+                m_scene.AddObject(fileObject);
                 fileObject.ScheduleGroupForFullUpdate();
             }
         }
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Examples.SimpleModule
                 ComplexObject complexObject =
                     new ComplexObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(),
                                       pos + posOffset);
-                m_scene.AddEntity(complexObject);
+                m_scene.AddObject(complexObject);
             }
         }
 
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Examples.SimpleModule
             SceneObjectGroup sceneObject =
                 new CpuCounterObject(m_scene, regionInfo.RegionHandle, LLUUID.Zero, m_scene.PrimIDAllocate(),
                                      pos + new LLVector3(1f, 1f, 1f));
-            m_scene.AddEntity(sceneObject);
+            m_scene.AddObject(sceneObject);
         }
 
         public void Close()