diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
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(); |