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

Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly. 

This no longer double counts child agent removals
0.7.3-extended
Justin Clark-Casey (justincc) 2012-06-08 00:59:39 +01:00
parent 28f93512bc
commit ba0ebe6d75
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/OpenSim.cs
View File

@ -486,7 +486,7 @@ namespace OpenSim
else else
presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
presence.ControllingClient.Close(); presence.Scene.IncomingCloseAgent(presence.UUID);
} }
} }

6
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -720,12 +720,6 @@ namespace OpenSim.Region.Framework.Scenes
public int GetChildAgentCount() public int GetChildAgentCount()
{ {
// some network situations come in where child agents get closed twice.
// if (m_numChildAgents < 0)
// {
// m_numChildAgents = 0;
// }
return m_numChildAgents; return m_numChildAgents;
} }