OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* refactor: rename CreatePrimFromXml to CreatePrimFromXml2

0.6.0-stable
Justin Clarke Casey 2008-06-12 16:54:04 +00:00
parent e1140a4f9b
commit 74017a4331
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
View File

@ -143,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
rootNode = doc.FirstChild; rootNode = doc.FirstChild;
foreach (XmlNode aPrimNode in rootNode.ChildNodes) 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) foreach (XmlNode aPrimNode in rootNode.ChildNodes)
{ {
CreatePrimFromXml(scene, aPrimNode.OuterXml); CreatePrimFromXml2(scene, aPrimNode.OuterXml);
} }
} }
public static void CreatePrimFromXml(Scene scene, string xmlData) /// <summary>
/// Create a prim from the xml2 representation.
/// </summary>
/// <param name="scene"></param>
/// <param name="xmlData"></param>
protected static void CreatePrimFromXml2(Scene scene, string xmlData)
{ {
SceneObjectGroup obj = new SceneObjectGroup(xmlData); SceneObjectGroup obj = new SceneObjectGroup(xmlData);
LLVector3 receivedVelocity = obj.RootPart.Velocity; LLVector3 receivedVelocity = obj.RootPart.Velocity;
//System.Console.WriteLine(obj.RootPart.Velocity.ToString()); //System.Console.WriteLine(obj.RootPart.Velocity.ToString());
scene.AddSceneObjectFromStorage(obj); scene.AddSceneObjectFromStorage(obj);

4
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -326,7 +326,7 @@ namespace OpenSim.Region.Environment.Scenes
#region Constructors #region Constructors
/// <summary> /// <summary>
/// /// Constructor
/// </summary> /// </summary>
public SceneObjectGroup() public SceneObjectGroup()
{ {
@ -766,8 +766,8 @@ namespace OpenSim.Region.Environment.Scenes
AttachToBackup(); AttachToBackup();
m_rootPart.ScheduleFullUpdate(); m_rootPart.ScheduleFullUpdate();
m_rootPart.ClearUndoState(); m_rootPart.ClearUndoState();
} }
public void DetachToInventoryPrep() public void DetachToInventoryPrep()
{ {
ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar); ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar);