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

2 files changed, 1 insertions, 7 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1d00522..9c38ebe 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -486,7 +486,7 @@ namespace OpenSim
                     else
                         presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
-                    presence.ControllingClient.Close();
+                    presence.Scene.IncomingCloseAgent(presence.UUID);
                 }
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 82a4f64..a59758f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -702,12 +702,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         public int GetChildAgentCount()
         {
-            // some network situations come in where child agents get closed twice.
-//            if (m_numChildAgents < 0)
-//            {
-//                m_numChildAgents = 0;
-//            }
-
             return m_numChildAgents;
         }