From f1fbb774b6f08acde0c88618911dd4dc311217ad Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 26 Jan 2013 20:39:17 +0100
Subject: Reinstate cleaning objects from parcel when avatars sit on them.
Instead do it properly for temp-on-rez. Auto-return overrides sitting. Temp
does not.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e3bc8c7..c7a38f7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5122,7 +5122,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
{
- if (grp.RootPart.Expires <= DateTime.Now)
+ if (grp.GetSittingAvatarsCount() == 0 && grp.RootPart.Expires <= DateTime.Now)
DeleteSceneObject(grp, false);
}
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 41f04e2..ed1bbd8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2023,7 +2023,7 @@ namespace OpenSim.Region.Framework.Scenes
(parcel.LandData.GroupID != GroupID ||
parcel.LandData.GroupID == UUID.Zero))
{
- if (GetSittingAvatarsCount() == 0 && (DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
+ if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
parcel.LandData.OtherCleanTime)
{
DetachFromBackup();
--
cgit v1.1