aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-09 17:52:29 +0100
committerJustin Clark-Casey (justincc)2013-08-09 17:52:29 +0100
commit97bcb59bee8a744c967b85f5feee263793161325 (patch)
tree67ec4306424df40c53fe6942bf02af680da21cea /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentComment back out seed dump code enabled in b1c26a56. Also adds a few telepor... (diff)
downloadopensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.zip
opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.tar.gz
opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.tar.bz2
opensim-SC_OLD-97bcb59bee8a744c967b85f5feee263793161325.tar.xz
Merge branch 'TeleportWork'
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0dbce2f..f0d8181 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -512,7 +512,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
512 // We still perform a force close inside the sync lock since this is intended to attempt close where 512 // We still perform a force close inside the sync lock since this is intended to attempt close where
513 // there is some unidentified connection problem, not where we have issues due to deadlock 513 // there is some unidentified connection problem, not where we have issues due to deadlock
514 if (!IsActive && !force) 514 if (!IsActive && !force)
515 {
516 m_log.DebugFormat(
517 "[CLIENT]: Not attempting to close inactive client {0} in {1} since force flag is not set",
518 Name, m_scene.Name);
519
515 return; 520 return;
521 }
516 522
517 IsActive = false; 523 IsActive = false;
518 CloseWithoutChecks(); 524 CloseWithoutChecks();