diff options
author | UbitUmarov | 2016-07-08 09:56:59 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-08 09:56:59 +0100 |
commit | 11a8a722df89ea1066aa1c81f263554a8f425bf3 (patch) | |
tree | f394818feb8761a2bb2cae35a1b89e36b2b0d68d /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Correction of a test introduced in 34b308d5b6d2a34e6607aa2b67f01c0f207635b4 (diff) | |
download | opensim-SC_OLD-11a8a722df89ea1066aa1c81f263554a8f425bf3.zip opensim-SC_OLD-11a8a722df89ea1066aa1c81f263554a8f425bf3.tar.gz opensim-SC_OLD-11a8a722df89ea1066aa1c81f263554a8f425bf3.tar.bz2 opensim-SC_OLD-11a8a722df89ea1066aa1c81f263554a8f425bf3.tar.xz |
don't auto return objects if they have sitting avatars (not npcs) - mantis 7828 with diferent code
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1892a21..e291387 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2225,6 +2225,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
2225 | if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > | 2225 | if ((DateTime.UtcNow - RootPart.Rezzed).TotalMinutes > |
2226 | parcel.LandData.OtherCleanTime) | 2226 | parcel.LandData.OtherCleanTime) |
2227 | { | 2227 | { |
2228 | // don't autoreturn if we have a sitting avatar | ||
2229 | // mantis 7828 (but none the provided patchs) | ||
2230 | |||
2231 | if(GetSittingAvatarsCount() > 0) | ||
2232 | { | ||
2233 | // do not respect npcs | ||
2234 | List<ScenePresence> sitters = GetSittingAvatars(); | ||
2235 | foreach(ScenePresence sp in sitters) | ||
2236 | { | ||
2237 | if(!sp.IsDeleted && !sp.isNPC && sp.IsSatOnObject) | ||
2238 | return; | ||
2239 | } | ||
2240 | } | ||
2241 | |||
2228 | DetachFromBackup(); | 2242 | DetachFromBackup(); |
2229 | m_log.DebugFormat( | 2243 | m_log.DebugFormat( |
2230 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", | 2244 | "[SCENE OBJECT GROUP]: Returning object {0} due to parcel autoreturn", |