diff options
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index 2ac0754..5ec8026 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | |||
@@ -56,14 +56,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
56 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 56 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
57 | { | 57 | { |
58 | SceneObjectGroup obj = new SceneObjectGroup(scene, scene.RegionInfo.RegionHandle, aPrimNode.OuterXml); | 58 | SceneObjectGroup obj = new SceneObjectGroup(scene, scene.RegionInfo.RegionHandle, aPrimNode.OuterXml); |
59 | 59 | ||
60 | if (newIDS) | 60 | if (newIDS) |
61 | { | 61 | { |
62 | obj.ResetIDs(); | 62 | obj.ResetIDs(); |
63 | } | 63 | } |
64 | //if we want this to be a import method then we need new uuids for the object to avoid any clashes | 64 | //if we want this to be a import method then we need new uuids for the object to avoid any clashes |
65 | //obj.RegenerateFullIDs(); | 65 | //obj.RegenerateFullIDs(); |
66 | 66 | ||
67 | scene.AddSceneObject(obj); | 67 | scene.AddSceneObject(obj); |
68 | 68 | ||
69 | SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); | 69 | SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
156 | { | 156 | { |
157 | LoadPrimsFromXml2(scene, new XmlTextReader(fileName)); | 157 | LoadPrimsFromXml2(scene, new XmlTextReader(fileName)); |
158 | } | 158 | } |
159 | 159 | ||
160 | /// <summary> | 160 | /// <summary> |
161 | /// Load prims from the xml2 format | 161 | /// Load prims from the xml2 format |
162 | /// </summary> | 162 | /// </summary> |
@@ -173,24 +173,24 @@ namespace OpenSim.Region.Environment.Scenes | |||
173 | /// <param name="scene"></param> | 173 | /// <param name="scene"></param> |
174 | /// <param name="reader"></param> | 174 | /// <param name="reader"></param> |
175 | protected static void LoadPrimsFromXml2(Scene scene, XmlTextReader reader) | 175 | protected static void LoadPrimsFromXml2(Scene scene, XmlTextReader reader) |
176 | { | 176 | { |
177 | XmlDocument doc = new XmlDocument(); | 177 | XmlDocument doc = new XmlDocument(); |
178 | reader.WhitespaceHandling = WhitespaceHandling.None; | 178 | reader.WhitespaceHandling = WhitespaceHandling.None; |
179 | doc.Load(reader); | 179 | doc.Load(reader); |
180 | reader.Close(); | 180 | reader.Close(); |
181 | XmlNode rootNode = doc.FirstChild; | 181 | XmlNode rootNode = doc.FirstChild; |
182 | 182 | ||
183 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 183 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
184 | { | 184 | { |
185 | CreatePrimFromXml(scene, aPrimNode.OuterXml); | 185 | CreatePrimFromXml(scene, aPrimNode.OuterXml); |
186 | } | 186 | } |
187 | } | 187 | } |
188 | 188 | ||
189 | public static void CreatePrimFromXml(Scene scene, string xmlData) | 189 | public static void CreatePrimFromXml(Scene scene, string xmlData) |
190 | { | 190 | { |
191 | SceneObjectGroup obj = new SceneObjectGroup(xmlData); | 191 | SceneObjectGroup obj = new SceneObjectGroup(xmlData); |
192 | LLVector3 receivedVelocity = obj.RootPart.Velocity; | 192 | LLVector3 receivedVelocity = obj.RootPart.Velocity; |
193 | //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); | 193 | //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); |
194 | scene.AddSceneObjectFromStorage(obj); | 194 | scene.AddSceneObjectFromStorage(obj); |
195 | 195 | ||
196 | SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); | 196 | SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); |