aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-01-26 20:39:17 +0100
committerMelanie2013-01-26 20:39:17 +0100
commitf1fbb774b6f08acde0c88618911dd4dc311217ad (patch)
treecd80a240a30cccdba4b912f797dac68aeb0c4354
parentStop temp-on-rez object from being deleted while an avatar sits on them (diff)
downloadopensim-SC_OLD-f1fbb774b6f08acde0c88618911dd4dc311217ad.zip
opensim-SC_OLD-f1fbb774b6f08acde0c88618911dd4dc311217ad.tar.gz
opensim-SC_OLD-f1fbb774b6f08acde0c88618911dd4dc311217ad.tar.bz2
opensim-SC_OLD-f1fbb774b6f08acde0c88618911dd4dc311217ad.tar.xz
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.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
2 files changed, 2 insertions, 2 deletions
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
5122 { 5122 {
5123 if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0) 5123 if ((grp.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
5124 { 5124 {
5125 if (grp.RootPart.Expires <= DateTime.Now) 5125 if (grp.GetSittingAvatarsCount() == 0 && grp.RootPart.Expires <= DateTime.Now)
5126 DeleteSceneObject(grp, false); 5126 DeleteSceneObject(grp, false);
5127 } 5127 }
5128 } 5128 }
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
2023 (parcel.LandData.GroupID != GroupID || 2023 (parcel.LandData.GroupID != GroupID ||
2024 parcel.LandData.GroupID == UUID.Zero)) 2024 parcel.LandData.GroupID == UUID.Zero))
2025 { 2025 {
2026 if (GetSittingAvatarsCount() == 0 && (DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > 2026 if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes >
2027 parcel.LandData.OtherCleanTime) 2027 parcel.LandData.OtherCleanTime)
2028 { 2028 {
2029 DetachFromBackup(); 2029 DetachFromBackup();