aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDalien Talbot2007-11-18 07:07:50 +0000
committerDalien Talbot2007-11-18 07:07:50 +0000
commit8ebf75ec2465cd40bb60390ec2ceb44d77220d75 (patch)
treeeeef8da4e471e64a61d7ba7d709d14c805062e15 /OpenSim
parentTrap the error during the logout with connections to multiple sims on (diff)
downloadopensim-SC_OLD-8ebf75ec2465cd40bb60390ec2ceb44d77220d75.zip
opensim-SC_OLD-8ebf75ec2465cd40bb60390ec2ceb44d77220d75.tar.gz
opensim-SC_OLD-8ebf75ec2465cd40bb60390ec2ceb44d77220d75.tar.bz2
opensim-SC_OLD-8ebf75ec2465cd40bb60390ec2ceb44d77220d75.tar.xz
Revert the previous commit - indeed this needs to be fixed in a
different place...
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index dc3d810..353a24c 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -152,14 +152,8 @@ namespace OpenSim.Region.ClientStack
152 public void Close() 152 public void Close()
153 { 153 {
154 clientPingTimer.Stop(); 154 clientPingTimer.Stop();
155 try 155
156 { 156 m_scene.RemoveClient(AgentId);
157 m_scene.RemoveClient(AgentId);
158 }
159 catch (Exception e)
160 {
161 MainLog.Instance.Error("ClientView.cs:Close, exception: " + e.ToString());
162 }
163 157
164 ClientThread.Abort(); 158 ClientThread.Abort();
165 } 159 }
@@ -395,4 +389,4 @@ namespace OpenSim.Region.ClientStack
395 ClientThread.Abort(); 389 ClientThread.Abort();
396 } 390 }
397 } 391 }
398} 392} \ No newline at end of file