From 11a8a722df89ea1066aa1c81f263554a8f425bf3 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 8 Jul 2016 09:56:59 +0100 Subject: [PATCH] don't auto return objects if they have sitting avatars (not npcs) - mantis 7828 with diferent code --- .../Region/Framework/Scenes/SceneObjectGroup.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1892a21d9d..e291387012 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2225,6 +2225,20 @@ namespace OpenSim.Region.Framework.Scenes if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > parcel.LandData.OtherCleanTime) { + // don't autoreturn if we have a sitting avatar + // mantis 7828 (but none the provided patchs) + + if(GetSittingAvatarsCount() > 0) + { + // do not respect npcs + List sitters = GetSittingAvatars(); + foreach(ScenePresence sp in sitters) + { + if(!sp.IsDeleted && !sp.isNPC && sp.IsSatOnObject) + return; + } + } + DetachFromBackup(); m_log.DebugFormat( "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn",