From aa57b386b7d03d0b6ce3ac076efcff0667207f19 Mon Sep 17 00:00:00 2001
From: Dalien Talbot <dalienta@gmail.com>
Date: Sun, 18 Nov 2007 06:33:15 +0000
Subject: [PATCH] Trap the error during the logout with connections to multiple
 sims on the same box (error in closecircuit) - temp band-aid, should have a
 better fix.

---
 OpenSim/Region/ClientStack/ClientView.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 353a24cf60..dc3d8108e0 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -152,8 +152,14 @@ namespace OpenSim.Region.ClientStack
         public void Close()
         {
             clientPingTimer.Stop();
-
-            m_scene.RemoveClient(AgentId);
+            try
+            {
+                m_scene.RemoveClient(AgentId);
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.Error("ClientView.cs:Close, exception: " + e.ToString());
+            }
 
             ClientThread.Abort();
         }
@@ -389,4 +395,4 @@ namespace OpenSim.Region.ClientStack
             ClientThread.Abort();
         }
     }
-}
\ No newline at end of file
+}