aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-12 16:54:04 +0000
committerJustin Clarke Casey2008-06-12 16:54:04 +0000
commit74017a4331acd1a246845acdcb1a85376b34dac8 (patch)
treee8f2f4b201c096e7528a1a535ba488defb4f99f0 /OpenSim/Region/Environment/Modules
parentthis, in theory, adds migration support to mysql for all (diff)
downloadopensim-SC_OLD-74017a4331acd1a246845acdcb1a85376b34dac8.zip
opensim-SC_OLD-74017a4331acd1a246845acdcb1a85376b34dac8.tar.gz
opensim-SC_OLD-74017a4331acd1a246845acdcb1a85376b34dac8.tar.bz2
opensim-SC_OLD-74017a4331acd1a246845acdcb1a85376b34dac8.tar.xz
* refactor: rename CreatePrimFromXml to CreatePrimFromXml2
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index 5ec8026..0c4887f 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
143 rootNode = doc.FirstChild; 143 rootNode = doc.FirstChild;
144 foreach (XmlNode aPrimNode in rootNode.ChildNodes) 144 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
145 { 145 {
146 CreatePrimFromXml(scene, aPrimNode.OuterXml); 146 CreatePrimFromXml2(scene, aPrimNode.OuterXml);
147 } 147 }
148 } 148 }
149 149
@@ -182,13 +182,20 @@ namespace OpenSim.Region.Environment.Scenes
182 182
183 foreach (XmlNode aPrimNode in rootNode.ChildNodes) 183 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
184 { 184 {
185 CreatePrimFromXml(scene, aPrimNode.OuterXml); 185 CreatePrimFromXml2(scene, aPrimNode.OuterXml);
186 } 186 }
187 } 187 }
188 188
189 public static void CreatePrimFromXml(Scene scene, string xmlData) 189 /// <summary>
190 /// Create a prim from the xml2 representation.
191 /// </summary>
192 /// <param name="scene"></param>
193 /// <param name="xmlData"></param>
194 protected static void CreatePrimFromXml2(Scene scene, string xmlData)
190 { 195 {
191 SceneObjectGroup obj = new SceneObjectGroup(xmlData); 196 SceneObjectGroup obj = new SceneObjectGroup(xmlData);
197
198
192 LLVector3 receivedVelocity = obj.RootPart.Velocity; 199 LLVector3 receivedVelocity = obj.RootPart.Velocity;
193 //System.Console.WriteLine(obj.RootPart.Velocity.ToString()); 200 //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
194 scene.AddSceneObjectFromStorage(obj); 201 scene.AddSceneObjectFromStorage(obj);