diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 40f8b96..ab8f835 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |||
@@ -23,7 +23,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
23 | m_regInfo = regionInfo; | 23 | m_regInfo = regionInfo; |
24 | } | 24 | } |
25 | 25 | ||
26 | public void LoadPrimsFromXml(string fileName) | 26 | public void LoadPrimsFromXml(string fileName, bool newIDS) |
27 | { | 27 | { |
28 | XmlDocument doc = new XmlDocument(); | 28 | XmlDocument doc = new XmlDocument(); |
29 | XmlNode rootNode; | 29 | XmlNode rootNode; |
@@ -39,6 +39,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
39 | { | 39 | { |
40 | SceneObjectGroup obj = new SceneObjectGroup(m_parentScene, | 40 | SceneObjectGroup obj = new SceneObjectGroup(m_parentScene, |
41 | m_regInfo.RegionHandle, aPrimNode.OuterXml); | 41 | m_regInfo.RegionHandle, aPrimNode.OuterXml); |
42 | if (newIDS) | ||
43 | { | ||
44 | obj.GenerateNewIDs(); | ||
45 | } | ||
42 | //if we want this to be a import method then we need new uuids for the object to avoid any clashes | 46 | //if we want this to be a import method then we need new uuids for the object to avoid any clashes |
43 | //obj.RegenerateFullIDs(); | 47 | //obj.RegenerateFullIDs(); |
44 | m_innerScene.AddEntity(obj); | 48 | m_innerScene.AddEntity(obj); |