aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorubit2012-08-03 17:27:59 +0200
committerubit2012-08-03 17:27:59 +0200
commitd259b6e57e8cdce95667e2c77448c0442a592e65 (patch)
treeb08362f690c60dd297e46b6a7728adcb30c253b2 /OpenSim/Region/ClientStack/Linden
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentRemove a merge artefaci in IsActive handling and restore commented out correc... (diff)
downloadopensim-SC_OLD-d259b6e57e8cdce95667e2c77448c0442a592e65.zip
opensim-SC_OLD-d259b6e57e8cdce95667e2c77448c0442a592e65.tar.gz
opensim-SC_OLD-d259b6e57e8cdce95667e2c77448c0442a592e65.tar.bz2
opensim-SC_OLD-d259b6e57e8cdce95667e2c77448c0442a592e65.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1304e16..1410cf6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -517,7 +517,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
517 /// </summary> 517 /// </summary>
518 public void Close(bool sendStop) 518 public void Close(bool sendStop)
519 { 519 {
520// IsActive = false;
521 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. 520 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
522 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection. 521 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
523 lock (CloseSyncLock) 522 lock (CloseSyncLock)
@@ -525,7 +524,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
525 if (!IsActive) 524 if (!IsActive)
526 return; 525 return;
527 526
528// IsActive = false; 527 IsActive = false;
529 CloseWithoutChecks(sendStop); 528 CloseWithoutChecks(sendStop);
530 } 529 }
531 } 530 }