From ebd9f22b29bfbe0cfb0689405984f856e0413405 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 7 Nov 2008 18:46:11 +0000
Subject: * refactor: allocate local ids to prims only when an object is
 attached to a scene

---
 .../Modules/World/Archiver/ArchiveWriteRequestPreparation.cs            | 2 +-
 OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/World')

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 1fbc20f..0202841 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             if (null != objectAsset)
             {
                 string xml = Utils.BytesToString(objectAsset.Data);
-                SceneObjectGroup sog = new SceneObjectGroup(m_scene, m_scene.RegionInfo.RegionHandle, xml);
+                SceneObjectGroup sog = new SceneObjectGroup(xml, true);
                 GetSceneObjectAssetUuids(sog, assetUuids);
             }
         }
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index af69707..a069ac3 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Environment.Scenes
                 rootNode = doc.FirstChild;
                 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
                 {
-                    SceneObjectGroup obj = new SceneObjectGroup(scene, scene.RegionInfo.RegionHandle, aPrimNode.OuterXml);
+                    SceneObjectGroup obj = new SceneObjectGroup(aPrimNode.OuterXml, true);
 
                     if (newIDS)
                     {
-- 
cgit v1.1