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/Examples/SimpleModule/ComplexObject.cs | 2 +-
 OpenSim/Region/Examples/SimpleModule/RegionModule.cs  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Examples')

diff --git a/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs b/OpenSim/Region/Examples/SimpleModule/ComplexObject.cs
index 5300750..87a5ffc 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.RemoveObject(this);
+                m_scene.RemoveSceneObject(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 4129d61..7be2684 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.AddObject(fileObject);
+                m_scene.AddSceneObject(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.AddObject(complexObject);
+                m_scene.AddSceneObject(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.AddObject(sceneObject);
+            m_scene.AddSceneObject(sceneObject);
         }
 
         public void Close()
-- 
cgit v1.1