diff options
author | Justin Clarke Casey | 2008-06-12 16:54:04 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-12 16:54:04 +0000 |
commit | 74017a4331acd1a246845acdcb1a85376b34dac8 (patch) | |
tree | e8f2f4b201c096e7528a1a535ba488defb4f99f0 /OpenSim | |
parent | this, in theory, adds migration support to mysql for all (diff) | |
download | opensim-SC-74017a4331acd1a246845acdcb1a85376b34dac8.zip opensim-SC-74017a4331acd1a246845acdcb1a85376b34dac8.tar.gz opensim-SC-74017a4331acd1a246845acdcb1a85376b34dac8.tar.bz2 opensim-SC-74017a4331acd1a246845acdcb1a85376b34dac8.tar.xz |
* refactor: rename CreatePrimFromXml to CreatePrimFromXml2
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 |
2 files changed, 12 insertions, 5 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); |
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 | |||
326 | #region Constructors | 326 | #region Constructors |
327 | 327 | ||
328 | /// <summary> | 328 | /// <summary> |
329 | /// | 329 | /// Constructor |
330 | /// </summary> | 330 | /// </summary> |
331 | public SceneObjectGroup() | 331 | public SceneObjectGroup() |
332 | { | 332 | { |
@@ -766,8 +766,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
766 | AttachToBackup(); | 766 | AttachToBackup(); |
767 | m_rootPart.ScheduleFullUpdate(); | 767 | m_rootPart.ScheduleFullUpdate(); |
768 | m_rootPart.ClearUndoState(); | 768 | m_rootPart.ClearUndoState(); |
769 | |||
770 | } | 769 | } |
770 | |||
771 | public void DetachToInventoryPrep() | 771 | public void DetachToInventoryPrep() |
772 | { | 772 | { |
773 | ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar); | 773 | ScenePresence avatar = m_scene.GetScenePresence(m_rootPart.m_attachedAvatar); |