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

Reset Expire date for tempOnRez objects on rez. Fixes Mantis#2848

0.6.1-post-fixes
Homer Horwitz 2008-12-19 18:38:45 +00:00
parent 5313330e4d
commit fbd44e628c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1089,6 +1089,12 @@ if (m_shape != null) {
#region Public Methods #region Public Methods
public void ResetExpire()
{
Expires = DateTime.Now + new TimeSpan(600000000);
m_log.DebugFormat("[SOP]: Reset Expire to {0}", Expires);
}
public void AddFlag(PrimFlags flag) public void AddFlag(PrimFlags flag)
{ {
// PrimFlags prevflag = Flags; // PrimFlags prevflag = Flags;
@ -1098,7 +1104,7 @@ if (m_shape != null) {
_flags |= flag; _flags |= flag;
if (flag == PrimFlags.TemporaryOnRez) if (flag == PrimFlags.TemporaryOnRez)
Expires = DateTime.Now + new TimeSpan(600000000); ResetExpire();
} }
// System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); // System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString());
} }
@ -1459,7 +1465,7 @@ if (m_shape != null) {
{ {
return FromXml(UUID.Zero, xmlReader); return FromXml(UUID.Zero, xmlReader);
} }
/// <summary> /// <summary>
/// Restore this part from the serialized xml representation. /// Restore this part from the serialized xml representation.
/// </summary> /// </summary>
@ -1471,9 +1477,12 @@ if (m_shape != null) {
XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart)); XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart));
SceneObjectPart part = (SceneObjectPart)serializer.Deserialize(xmlReader); SceneObjectPart part = (SceneObjectPart)serializer.Deserialize(xmlReader);
part.m_fromUserInventoryItemID = fromUserInventoryItemId; part.m_fromUserInventoryItemID = fromUserInventoryItemId;
// for tempOnRez objects, we have to fix the Expire date.
if((part.Flags & PrimFlags.TemporaryOnRez) != 0) part.ResetExpire();
return part; return part;
} }
public UUID GetAvatarOnSitTarget() public UUID GetAvatarOnSitTarget()
{ {