diff options
author | Justin Clark-Casey (justincc) | 2011-09-02 00:50:16 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-02 00:50:16 +0100 |
commit | af7c6c5f39dc05dccb891e7bc19ec158de7718a9 (patch) | |
tree | dbf235e3c10fd92490ce9b13f4ce92855276c5b8 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Move more of IAM.RezObject() into DoPreRezWhenFromItem() (diff) | |
download | opensim-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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 15 |
1 files changed, 2 insertions, 13 deletions
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 | } |