aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-23 06:57:38 +0000
committerMelanie Thielker2008-11-23 06:57:38 +0000
commitbb982ab57fbc3a4f60fc7193588a189dff973e6b (patch)
tree4ec19ed9c21610aa03136f4e54b3b7329bafcacd /OpenSim/Region/Environment
parent05:24:49 - [PRESENCE]: Logging off 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb becau... (diff)
downloadopensim-SC-bb982ab57fbc3a4f60fc7193588a189dff973e6b.zip
opensim-SC-bb982ab57fbc3a4f60fc7193588a189dff973e6b.tar.gz
opensim-SC-bb982ab57fbc3a4f60fc7193588a189dff973e6b.tar.bz2
opensim-SC-bb982ab57fbc3a4f60fc7193588a189dff973e6b.tar.xz
Try to keep autoreturn from IM spamming users if the prims take a bit
longer to be deleted
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 0eefda1..9839126 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1222,6 +1222,7 @@ namespace OpenSim.Region.Environment.Scenes
1222 if ((DateTime.Now - RootPart.Rezzed).TotalMinutes > 1222 if ((DateTime.Now - RootPart.Rezzed).TotalMinutes >
1223 parcel.landData.OtherCleanTime) 1223 parcel.landData.OtherCleanTime)
1224 { 1224 {
1225 DetachFromBackup();
1225 m_log.InfoFormat("[SCENE] Returning object {0} due to parcel auto return", RootPart.UUID.ToString()); 1226 m_log.InfoFormat("[SCENE] Returning object {0} due to parcel auto return", RootPart.UUID.ToString());
1226 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return"); 1227 m_scene.AddReturn(OwnerID, Name, AbsolutePosition, "parcel auto return");
1227 m_scene.DeRezObject(null, RootPart.LocalId, 1228 m_scene.DeRezObject(null, RootPart.LocalId,