OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a merge artefaci in IsActive handling and restore commented out correct one

avinationmerge
Melanie 2012-08-03 15:22:53 +02:00
parent a4c59b1fd2
commit d677db338d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

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