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/SceneXmlLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
index 13483bb..742996e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Scenes
                     //if we want this to be a import method then we need new uuids for the object to avoid any clashes
                     //obj.RegenerateFullIDs();
                     
-                    m_innerScene.AddObject(obj);
+                    m_innerScene.AddSceneObject(obj);
 
                     SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
                     // Apply loadOffsets for load/import and move combinations
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
             SceneObjectGroup obj = new SceneObjectGroup(xmlData);
             LLVector3 receivedVelocity = obj.RootPart.Velocity;
             //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
-            m_innerScene.AddObjectFromStorage(obj);
+            m_innerScene.AddSceneObjectFromStorage(obj);
 
             SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
             bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) &&
-- 
cgit v1.1