aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-08 00:59:39 +0100
committerJustin Clark-Casey (justincc)2012-06-08 00:59:39 +0100
commit5c162ccd57639f0c711d9940ecdd3e2804d26304 (patch)
treecee3b37416eceefe5abce9abd52b8414438d1154
parentRemove duplicate update of user count in Scene.IncomingCloseAgent() (diff)
downloadopensim-SC_OLD-5c162ccd57639f0c711d9940ecdd3e2804d26304.zip
opensim-SC_OLD-5c162ccd57639f0c711d9940ecdd3e2804d26304.tar.gz
opensim-SC_OLD-5c162ccd57639f0c711d9940ecdd3e2804d26304.tar.bz2
opensim-SC_OLD-5c162ccd57639f0c711d9940ecdd3e2804d26304.tar.xz
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
-rw-r--r--OpenSim/Region/Application/OpenSim.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs6
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
486 else 486 else
487 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 487 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
488 488
489 presence.ControllingClient.Close(); 489 presence.Scene.IncomingCloseAgent(presence.UUID);
490 } 490 }
491 } 491 }
492 492
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
702 702
703 public int GetChildAgentCount() 703 public int GetChildAgentCount()
704 { 704 {
705 // some network situations come in where child agents get closed twice.
706// if (m_numChildAgents < 0)
707// {
708// m_numChildAgents = 0;
709// }
710
711 return m_numChildAgents; 705 return m_numChildAgents;
712 } 706 }
713 707