From 74017a4331acd1a246845acdcb1a85376b34dac8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 12 Jun 2008 16:54:04 +0000
Subject: * refactor: rename CreatePrimFromXml to CreatePrimFromXml2
---
.../Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 13 ++++++++++---
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 ++--
2 files changed, 12 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/Environment')
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
rootNode = doc.FirstChild;
foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{
- CreatePrimFromXml(scene, aPrimNode.OuterXml);
+ CreatePrimFromXml2(scene, aPrimNode.OuterXml);
}
}
@@ -182,13 +182,20 @@ namespace OpenSim.Region.Environment.Scenes
foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{
- CreatePrimFromXml(scene, aPrimNode.OuterXml);
+ CreatePrimFromXml2(scene, aPrimNode.OuterXml);
}
}
- public static void CreatePrimFromXml(Scene scene, string xmlData)
+ ///
+ /// Create a prim from the xml2 representation.
+ ///
+ ///
+ ///
+ protected static void CreatePrimFromXml2(Scene scene, string xmlData)
{
SceneObjectGroup obj = new SceneObjectGroup(xmlData);
+
+
LLVector3 receivedVelocity = obj.RootPart.Velocity;
//System.Console.WriteLine(obj.RootPart.Velocity.ToString());
scene.AddSceneObjectFromStorage(obj);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index d2687f3..67e2c70 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Region.Environment.Scenes
#region Constructors
///
- ///
+ /// Constructor
///
public SceneObjectGroup()
{
@@ -766,8 +766,8 @@ namespace OpenSim.Region.Environment.Scenes
AttachToBackup();
m_rootPart.ScheduleFullUpdate();
m_rootPart.ClearUndoState();
-
}
+
public void DetachToInventoryPrep()
{
ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar);
--
cgit v1.1