aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 22:45:13 +0000
committerJustin Clarke Casey2008-05-24 22:45:13 +0000
commitf3067ce6f9f2ea992f0e601ab120f3a1ff89cf94 (patch)
tree0ec2ccf815cba335f42b9a64f6a9cc18b0c78230 /OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs
parent* Refactor: Renaming various *Entity*() methods to *Object*() methods on the ... (diff)
downloadopensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.zip
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.gz
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.bz2
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs4
1 files changed, 2 insertions, 2 deletions
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
72 //if we want this to be a import method then we need new uuids for the object to avoid any clashes 72 //if we want this to be a import method then we need new uuids for the object to avoid any clashes
73 //obj.RegenerateFullIDs(); 73 //obj.RegenerateFullIDs();
74 74
75 m_innerScene.AddObject(obj); 75 m_innerScene.AddSceneObject(obj);
76 76
77 SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); 77 SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
78 // Apply loadOffsets for load/import and move combinations 78 // Apply loadOffsets for load/import and move combinations
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes
184 SceneObjectGroup obj = new SceneObjectGroup(xmlData); 184 SceneObjectGroup obj = new SceneObjectGroup(xmlData);
185 LLVector3 receivedVelocity = obj.RootPart.Velocity; 185 LLVector3 receivedVelocity = obj.RootPart.Velocity;
186 //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); 186 //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
187 m_innerScene.AddObjectFromStorage(obj); 187 m_innerScene.AddSceneObjectFromStorage(obj);
188 188
189 SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); 189 SceneObjectPart rootPart = obj.GetChildPart(obj.UUID);
190 bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) && 190 bool UsePhysics = (((rootPart.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) > 0) &&