Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
commit
0549dde3c6
|
@ -517,7 +517,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
/// </summary>
|
||||
public void Close(bool sendStop)
|
||||
{
|
||||
IsActive = false;
|
||||
// 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 +525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
if (!IsActive)
|
||||
return;
|
||||
|
||||
IsActive = false;
|
||||
// IsActive = false;
|
||||
CloseWithoutChecks(sendStop);
|
||||
}
|
||||
}
|
||||
|
@ -552,7 +552,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
OutPacket(disable, ThrottleOutPacketType.Unknown);
|
||||
}
|
||||
|
||||
IsActive = false;
|
||||
// IsActive = false;
|
||||
|
||||
// Shutdown the image manager
|
||||
ImageManager.Close();
|
||||
|
|
|
@ -2966,10 +2966,12 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
try
|
||||
{
|
||||
ScenePresence sp = GetScenePresence(agentID);
|
||||
PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
|
||||
|
||||
|
||||
if (sp != null)
|
||||
{
|
||||
PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
|
||||
sp.ControllingClient.Close();
|
||||
}
|
||||
|
||||
// BANG! SLASH!
|
||||
m_authenticateHandler.RemoveCircuit(agentID);
|
||||
|
|
Loading…
Reference in New Issue