diff options
author | Justin Clarke Casey | 2008-11-07 18:46:11 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-07 18:46:11 +0000 |
commit | ebd9f22b29bfbe0cfb0689405984f856e0413405 (patch) | |
tree | afc766dad4e3888fd773ac0e5186a9fdb45fb88f /OpenSim/Region/Environment/Modules | |
parent | * Apply patch in http://opensimulator.org/mantis/view.php?id=2397 (diff) | |
download | opensim-SC-ebd9f22b29bfbe0cfb0689405984f856e0413405.zip opensim-SC-ebd9f22b29bfbe0cfb0689405984f856e0413405.tar.gz opensim-SC-ebd9f22b29bfbe0cfb0689405984f856e0413405.tar.bz2 opensim-SC-ebd9f22b29bfbe0cfb0689405984f856e0413405.tar.xz |
* refactor: allocate local ids to prims only when an object is attached to a scene
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
176 | if (null != objectAsset) | 176 | if (null != objectAsset) |
177 | { | 177 | { |
178 | string xml = Utils.BytesToString(objectAsset.Data); | 178 | string xml = Utils.BytesToString(objectAsset.Data); |
179 | SceneObjectGroup sog = new SceneObjectGroup(m_scene, m_scene.RegionInfo.RegionHandle, xml); | 179 | SceneObjectGroup sog = new SceneObjectGroup(xml, true); |
180 | GetSceneObjectAssetUuids(sog, assetUuids); | 180 | GetSceneObjectAssetUuids(sog, assetUuids); |
181 | } | 181 | } |
182 | } | 182 | } |
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 | |||
58 | rootNode = doc.FirstChild; | 58 | rootNode = doc.FirstChild; |
59 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 59 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
60 | { | 60 | { |
61 | SceneObjectGroup obj = new SceneObjectGroup(scene, scene.RegionInfo.RegionHandle, aPrimNode.OuterXml); | 61 | SceneObjectGroup obj = new SceneObjectGroup(aPrimNode.OuterXml, true); |
62 | 62 | ||
63 | if (newIDS) | 63 | if (newIDS) |
64 | { | 64 | { |