From a453672edb8169f9957e136ee8252e7391170721 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 21 Dec 2007 16:55:03 +0000
Subject: * 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

---
 OpenSim/Framework/ClientManager.cs | 2 +-
 OpenSim/Framework/IClientAPI.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 698171d..e32c9eb 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -111,7 +111,7 @@ namespace OpenSim.Framework
                     if (m_clients.TryGetValue(circuits[i], out client))
                     {
                         Remove(client.CircuitCode);
-                        client.Close();
+                        client.Close(false);
                     }
                 }
                 catch (System.Exception e)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index fde74d6..41afe27 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -572,7 +572,7 @@ namespace OpenSim.Framework
 
         void SetDebug(int newDebug);
         void InPacket(Packet NewPack);
-        void Close();
+        void Close(bool ShutdownCircuit);
         void Kick(string message);
         void Stop();
         event ViewerEffectEventHandler OnViewerEffect;
-- 
cgit v1.1