* Remapped the Connection shutdown path.

* This fixes a *bunch* of Mantis bugs related to the following
* -- Neighbouring simulators not appearing after relog
* -- Login to simulator only to be logged off by simulator.
* -- ThreadAbort 
* -- Unable to shutdown circuitCode: x

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0cb353c..c4b409f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment.Scenes
             // Stop all client threads.
             ForEachScenePresence(delegate(ScenePresence avatar)
                     {
-                        avatar.ControllingClient.Close();
+                        avatar.ControllingClient.Close(true);
                     });
             // Stop updating the scene objects and agents.
             m_heartbeatTimer.Close();
@@ -1758,7 +1758,7 @@ namespace OpenSim.Region.Environment.Scenes
                                                         bool childagent = !p.Equals(null) && p.IsChildAgent;
                                                         if (controller.AgentId != godID && !childagent) // Do we really want to kick the initiator of this madness?
                                                         {
-                                                            controller.Close();
+                                                            controller.Close(true);
                                                         }
                                                     }
                             );
@@ -1775,7 +1775,7 @@ namespace OpenSim.Region.Environment.Scenes
                         }
 
                         m_scenePresences[agentID].ControllingClient.Kick(Helpers.FieldToUTF8String(reason));
-                        m_scenePresences[agentID].ControllingClient.Close();
+                        m_scenePresences[agentID].ControllingClient.Close(true);
                     }
                 }
                 else