ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

stop passing FromUserInventoryItemID right down into the deserializer.

Browse Source 
the code becomes simpler if this is set from the outside - only one place needs to do this.
This commit is contained in:
Justin Clark-Casey (justincc)
2011-09-02 00:50:16 +01:00
parent 9c0a03731d
commit af7c6c5f39
3 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1903,23 +1903,12 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="xmlReader"></param>
/// <returns></returns>
public static SceneObjectPart FromXml(XmlTextReader xmlReader)
{
return FromXml(UUID.Zero, xmlReader);
}
/// <summary>
/// Restore this part from the serialized xml representation.
/// </summary>
/// <param name="fromUserInventoryItemId">The inventory id from which this part came, if applicable</param>
/// <param name="xmlReader"></param>
/// <returns></returns>
public static SceneObjectPart FromXml(UUID fromUserInventoryItemId, XmlTextReader xmlReader)
{
SceneObjectPart part = SceneObjectSerializer.Xml2ToSOP(xmlReader);
part.m_fromUserInventoryItemID = fromUserInventoryItemId;
// for tempOnRez objects, we have to fix the Expire date.
if ((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire();
if ((part.Flags & PrimFlags.TemporaryOnRez) != 0)
part.ResetExpire();
return part;
}