From 8714833986cef44787fd57a61699b7bdcfd3d3bb Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 12 Jun 2008 17:49:08 +0000 Subject: * refactor: For new objects, move attach to backup to occur when adding to a scene, rather than on creation of the group * Adding to a scene is now parameterized such that one can choose not to actually persist that group * This is to support a use case where a module wants a scene which consists of both objects which are persisted, and ones which are just temporary for the lifetime of that server instance --- .../Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs') diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index 0c4887f..54538d8 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs @@ -64,7 +64,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(); - scene.AddSceneObject(obj); + scene.AddSceneObject(obj, true); SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); // Apply loadOffsets for load/import and move combinations @@ -193,8 +193,7 @@ namespace OpenSim.Region.Environment.Scenes /// protected static void CreatePrimFromXml2(Scene scene, string xmlData) { - SceneObjectGroup obj = new SceneObjectGroup(xmlData); - + SceneObjectGroup obj = new SceneObjectGroup(xmlData); LLVector3 receivedVelocity = obj.RootPart.Velocity; //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); -- cgit v1.1