3 files changed, 15 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f7bb817..8cac731 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -517,7 +517,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public void Close(bool sendStop)
         {
-            IsActive = false;
             // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
             // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
             lock (CloseSyncLock)
@@ -552,8 +551,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 OutPacket(disable, ThrottleOutPacketType.Unknown);
             }
 
-            IsActive = false;
-
             // Shutdown the image manager
             ImageManager.Close();
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3a28d42..3db7c7d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2966,10 +2966,12 @@ namespace OpenSim.Region.Framework.Scenes
                     try
                     {
                         ScenePresence sp = GetScenePresence(agentID);
-                        PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
-                        
+
                         if (sp != null)
+                        {
+                            PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
                             sp.ControllingClient.Close();
+                        }
 
                         // BANG! SLASH!
                         m_authenticateHandler.RemoveCircuit(agentID);
@@ -3886,6 +3888,15 @@ namespace OpenSim.Region.Framework.Scenes
 
         public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
         {
+            if (posX < 0)
+                posX = 0;
+            else if (posX >= 256)
+                posX = 255.999f;
+            if (posY < 0)
+                posY = 0;
+            else if (posY >= 256)
+                posY = 255.999f;
+
             reason = String.Empty;
             if (Permissions.IsGod(agentID))
                 return true;
@@ -4244,7 +4255,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name='agentID'></param>
         protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
         {
-            int ntimes = 10;
+            int ntimes = 20;
             ScenePresence sp = null;
             while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0))
                 Thread.Sleep(1000);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index cd93386..e1c2243 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors.Simulation
             reason = String.Empty;
             if (destination == null)
             {
+                reason = "Destination not found";
                 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
                 return false;
             }