From d677db338d8cfe8de5db5f279cd3638510b360c9 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 3 Aug 2012 15:22:53 +0200
Subject: Remove a merge artefaci in IsActive handling and restore commented
 out correct one

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Region')

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
         /// </summary>
         public void Close(bool sendStop)
         {
-//            IsActive = false;
             // We lock here to prevent race conditions between two threads calling close simultaneously (e.g.
             // a simultaneous relog just as a client is being closed out due to no packet ack from the old connection.
             lock (CloseSyncLock)
@@ -525,7 +524,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (!IsActive)
                     return;
 
-//                IsActive = false;
+                IsActive = false;
                 CloseWithoutChecks(sendStop);
             }
         }
-- 
cgit v1.1