From 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 4 Jun 2008 09:59:27 +0000 Subject: Formatting cleanup, minor refactoring, svn properties. --- .../Modules/World/Serialiser/SceneXmlLoader.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 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 foreach (XmlNode aPrimNode in rootNode.ChildNodes) { SceneObjectGroup obj = new SceneObjectGroup(scene, scene.RegionInfo.RegionHandle, aPrimNode.OuterXml); - + if (newIDS) { obj.ResetIDs(); } //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); SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); @@ -156,7 +156,7 @@ namespace OpenSim.Region.Environment.Scenes { LoadPrimsFromXml2(scene, new XmlTextReader(fileName)); } - + /// /// Load prims from the xml2 format /// @@ -173,24 +173,24 @@ namespace OpenSim.Region.Environment.Scenes /// /// protected static void LoadPrimsFromXml2(Scene scene, XmlTextReader reader) - { - XmlDocument doc = new XmlDocument(); + { + XmlDocument doc = new XmlDocument(); reader.WhitespaceHandling = WhitespaceHandling.None; doc.Load(reader); reader.Close(); XmlNode rootNode = doc.FirstChild; - + foreach (XmlNode aPrimNode in rootNode.ChildNodes) { CreatePrimFromXml(scene, aPrimNode.OuterXml); - } + } } public static void CreatePrimFromXml(Scene scene, string xmlData) { SceneObjectGroup obj = new SceneObjectGroup(xmlData); LLVector3 receivedVelocity = obj.RootPart.Velocity; - //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); + //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); scene.AddSceneObjectFromStorage(obj); SceneObjectPart rootPart = obj.GetChildPart(obj.UUID); -- cgit v1.1