aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDalien Talbot2007-11-18 06:33:15 +0000
committerDalien Talbot2007-11-18 06:33:15 +0000
commitaa57b386b7d03d0b6ce3ac076efcff0667207f19 (patch)
tree323dbeae7bcc03ed689d52ccd6bf8cdda63233fc /OpenSim
parentAdditional debugging output to see for what coordinates is the worldmap (diff)
downloadopensim-SC_OLD-aa57b386b7d03d0b6ce3ac076efcff0667207f19.zip
opensim-SC_OLD-aa57b386b7d03d0b6ce3ac076efcff0667207f19.tar.gz
opensim-SC_OLD-aa57b386b7d03d0b6ce3ac076efcff0667207f19.tar.bz2
opensim-SC_OLD-aa57b386b7d03d0b6ce3ac076efcff0667207f19.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 353a24c..dc3d810 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -152,8 +152,14 @@ namespace OpenSim.Region.ClientStack
152 public void Close() 152 public void Close()
153 { 153 {
154 clientPingTimer.Stop(); 154 clientPingTimer.Stop();
155 155 try
156 m_scene.RemoveClient(AgentId); 156 {
157 m_scene.RemoveClient(AgentId);
158 }
159 catch (Exception e)
160 {
161 MainLog.Instance.Error("ClientView.cs:Close, exception: " + e.ToString());
162 }
157 163
158 ClientThread.Abort(); 164 ClientThread.Abort();
159 } 165 }
@@ -389,4 +395,4 @@ namespace OpenSim.Region.ClientStack
389 ClientThread.Abort(); 395 ClientThread.Abort();
390 } 396 }
391 } 397 }
392} \ No newline at end of file 398}