aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-02 00:50:16 +0100
committerJustin Clark-Casey (justincc)2011-09-02 00:50:16 +0100
commitaf7c6c5f39dc05dccb891e7bc19ec158de7718a9 (patch)
treedbf235e3c10fd92490ce9b13f4ce92855276c5b8
parentMove more of IAM.RezObject() into DoPreRezWhenFromItem() (diff)
downloadopensim-SC_OLD-af7c6c5f39dc05dccb891e7bc19ec158de7718a9.zip
opensim-SC_OLD-af7c6c5f39dc05dccb891e7bc19ec158de7718a9.tar.gz
opensim-SC_OLD-af7c6c5f39dc05dccb891e7bc19ec158de7718a9.tar.bz2
opensim-SC_OLD-af7c6c5f39dc05dccb891e7bc19ec158de7718a9.tar.xz
stop passing FromUserInventoryItemID right down into the deserializer.
the code becomes simpler if this is set from the outside - only one place needs to do this.
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs16
3 files changed, 7 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index f8515b4..e6b58b3 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -732,8 +732,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
732 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); 732 XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
733 if (e == null || attachment) // Single 733 if (e == null || attachment) // Single
734 { 734 {
735 SceneObjectGroup g = 735 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
736 SceneObjectSerializer.FromOriginalXmlFormat(UUID.Zero, xmlData);
737 736
738 objlist.Add(g); 737 objlist.Add(g);
739 veclist.Add(new Vector3(0, 0, 0)); 738 veclist.Add(new Vector3(0, 0, 0));
@@ -762,8 +761,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
762 XmlNodeList groups = e.SelectNodes("SceneObjectGroup"); 761 XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
763 foreach (XmlNode n in groups) 762 foreach (XmlNode n in groups)
764 { 763 {
765 SceneObjectGroup g = 764 SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
766 SceneObjectSerializer.FromOriginalXmlFormat(UUID.Zero, n.OuterXml);
767 765
768 objlist.Add(g); 766 objlist.Add(g);
769 XmlElement el = (XmlElement)n; 767 XmlElement el = (XmlElement)n;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9d573db..04fef83 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1904,22 +1904,11 @@ namespace OpenSim.Region.Framework.Scenes
1904 /// <returns></returns> 1904 /// <returns></returns>
1905 public static SceneObjectPart FromXml(XmlTextReader xmlReader) 1905 public static SceneObjectPart FromXml(XmlTextReader xmlReader)
1906 { 1906 {
1907 return FromXml(UUID.Zero, xmlReader);
1908 }
1909
1910 /// <summary>
1911 /// Restore this part from the serialized xml representation.
1912 /// </summary>
1913 /// <param name="fromUserInventoryItemId">The inventory id from which this part came, if applicable</param>
1914 /// <param name="xmlReader"></param>
1915 /// <returns></returns>
1916 public static SceneObjectPart FromXml(UUID fromUserInventoryItemId, XmlTextReader xmlReader)
1917 {
1918 SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader); 1907 SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader);
1919 part.m_fromUserInventoryItemID = fromUserInventoryItemId;
1920 1908
1921 // for tempOnRez objects, we have to fix the Expire date. 1909 // for tempOnRez objects, we have to fix the Expire date.
1922 if ((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire(); 1910 if ((part.Flags & PrimFlags.TemporaryOnRez) != 0)
1911 part.ResetExpire();
1923 1912
1924 return part; 1913 return part;
1925 } 1914 }
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index a60ee9b..e06a222 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -53,19 +53,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
53 /// <summary> 53 /// <summary>
54 /// Deserialize a scene object from the original xml format 54 /// Deserialize a scene object from the original xml format
55 /// </summary> 55 /// </summary>
56 /// <param name="serialization"></param> 56 /// <param name="xmlData"></param>
57 /// <returns></returns> 57 /// <returns></returns>
58 public static SceneObjectGroup FromOriginalXmlFormat(string serialization) 58 public static SceneObjectGroup FromOriginalXmlFormat(string xmlData)
59 {
60 return FromOriginalXmlFormat(UUID.Zero, serialization);
61 }
62
63 /// <summary>
64 /// Deserialize a scene object from the original xml format
65 /// </summary>
66 /// <param name="serialization"></param>
67 /// <returns></returns>
68 public static SceneObjectGroup FromOriginalXmlFormat(UUID fromUserInventoryItemID, string xmlData)
69 { 59 {
70 //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); 60 //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
71 //int time = System.Environment.TickCount; 61 //int time = System.Environment.TickCount;
@@ -87,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
87 77
88 sr = new StringReader(parts[0].InnerXml); 78 sr = new StringReader(parts[0].InnerXml);
89 reader = new XmlTextReader(sr); 79 reader = new XmlTextReader(sr);
90 SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(fromUserInventoryItemID, reader)); 80 SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
91 reader.Close(); 81 reader.Close();
92 sr.Close(); 82 sr.Close();
93 83