Fix bug with "kick user" reducing agent counts by 2 instead of 1.

This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index caba236..1d00522 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -486,10 +486,10 @@ namespace OpenSim
                     else
                         presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
-                    // ...and close on our side
-                    presence.Scene.IncomingCloseAgent(presence.UUID);
+                    presence.ControllingClient.Close();
                 }
             }
+
             MainConsole.Instance.Output("");
         }