From c72c84b4559ea164bcb77c2d64a046729662bf04 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 21 Jul 2010 12:16:17 +0200
Subject: Refine autoreturn a bit

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7053c02..e738dd2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1681,7 +1681,10 @@ namespace OpenSim.Region.Framework.Scenes
 
             try
             {
-                if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart
+                if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
+                        m_scene.LoginsDisabled || // We're starting up or doing maintenance, don't mess with things
+                        m_scene.LoadingPrims) // Land may not be valid yet
+                
                 {
                     ILandObject parcel = m_scene.LandChannel.GetLandObject(
                             m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
-- 
cgit v1.1