aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorubit2012-08-03 16:22:34 +0200
committerubit2012-08-03 16:22:34 +0200
commit0549dde3c6437701187e28632b21801c240c6053 (patch)
treeefebb79b7f6d206bb43a3679199695a60653b382 /OpenSim/Region/ClientStack/Linden/UDP
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentminor change avoiding a null reference (diff)
downloadopensim-SC-0549dde3c6437701187e28632b21801c240c6053.zip
opensim-SC-0549dde3c6437701187e28632b21801c240c6053.tar.gz
opensim-SC-0549dde3c6437701187e28632b21801c240c6053.tar.bz2
opensim-SC-0549dde3c6437701187e28632b21801c240c6053.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f7bb817..1304e16 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -517,7 +517,7 @@ 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; 520// IsActive = false;
521 // We lock here to prevent race conditions between two threads calling close simultaneously (e.g. 521 // 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. 522 // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
523 lock (CloseSyncLock) 523 lock (CloseSyncLock)
@@ -525,7 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
525 if (!IsActive) 525 if (!IsActive)
526 return; 526 return;
527 527
528 IsActive = false; 528// IsActive = false;
529 CloseWithoutChecks(sendStop); 529 CloseWithoutChecks(sendStop);
530 } 530 }
531 } 531 }
@@ -552,7 +552,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
552 OutPacket(disable, ThrottleOutPacketType.Unknown); 552 OutPacket(disable, ThrottleOutPacketType.Unknown);
553 } 553 }
554 554
555 IsActive = false; 555// IsActive = false;
556 556
557 // Shutdown the image manager 557 // Shutdown the image manager
558 ImageManager.Close(); 558 ImageManager.Close();