diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 9458908..a214884 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -361,6 +361,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
361 | private uint _everyoneMask = (uint)PermissionMask.None; | 361 | private uint _everyoneMask = (uint)PermissionMask.None; |
362 | private uint _nextOwnerMask = (uint)PermissionMask.All; | 362 | private uint _nextOwnerMask = (uint)PermissionMask.All; |
363 | private PrimFlags _flags = 0; | 363 | private PrimFlags _flags = 0; |
364 | private DateTime m_expires; | ||
364 | 365 | ||
365 | public UUID CreatorID { | 366 | public UUID CreatorID { |
366 | get | 367 | get |
@@ -451,6 +452,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
451 | set { m_particleSystem = value; } | 452 | set { m_particleSystem = value; } |
452 | } | 453 | } |
453 | 454 | ||
455 | [XmlIgnore] | ||
456 | public DateTime Expires | ||
457 | { | ||
458 | get { return m_expires; } | ||
459 | set { m_expires = value; } | ||
460 | } | ||
461 | |||
454 | /// <summary> | 462 | /// <summary> |
455 | /// The position of the entire group that this prim belongs to. | 463 | /// The position of the entire group that this prim belongs to. |
456 | /// </summary> | 464 | /// </summary> |
@@ -1050,15 +1058,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
1050 | public void AddFlag(PrimFlags flag) | 1058 | public void AddFlag(PrimFlags flag) |
1051 | { | 1059 | { |
1052 | // PrimFlags prevflag = Flags; | 1060 | // PrimFlags prevflag = Flags; |
1053 | //uint objflags = Flags; | ||
1054 | if ((ObjectFlags & (uint) flag) == 0) | 1061 | if ((ObjectFlags & (uint) flag) == 0) |
1055 | { | 1062 | { |
1056 | //Console.WriteLine("Adding flag: " + ((PrimFlags) flag).ToString()); | 1063 | //Console.WriteLine("Adding flag: " + ((PrimFlags) flag).ToString()); |
1057 | _flags |= flag; | 1064 | _flags |= flag; |
1065 | |||
1066 | if (flag == PrimFlags.TemporaryOnRez) | ||
1067 | Expires = DateTime.Now + new TimeSpan(600000000); | ||
1058 | } | 1068 | } |
1059 | //uint currflag = (uint)Flags; | 1069 | // System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); |
1060 | //System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); | ||
1061 | //ScheduleFullUpdate(); | ||
1062 | } | 1070 | } |
1063 | 1071 | ||
1064 | /// <summary> | 1072 | /// <summary> |