aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-08 00:40:38 +0100
committerJustin Clark-Casey (justincc)2012-06-08 00:40:38 +0100
commitd547bcf8d15bdcb8604cf170dc8ec1e14ad4cdc0 (patch)
tree6d218ba2e89e39d05c8e1f0ccba5cef943ad822d /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d547bcf8d15bdcb8604cf170dc8ec1e14ad4cdc0.zip
opensim-SC_OLD-d547bcf8d15bdcb8604cf170dc8ec1e14ad4cdc0.tar.gz
opensim-SC_OLD-d547bcf8d15bdcb8604cf170dc8ec1e14ad4cdc0.tar.bz2
opensim-SC_OLD-d547bcf8d15bdcb8604cf170dc8ec1e14ad4cdc0.tar.xz
Remove duplicate update of user count in Scene.IncomingCloseAgent()
This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 17503b1..9048f00 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4039,16 +4039,6 @@ namespace OpenSim.Region.Framework.Scenes
4039 ScenePresence presence = m_sceneGraph.GetScenePresence(agentID); 4039 ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
4040 if (presence != null) 4040 if (presence != null)
4041 { 4041 {
4042 // Nothing is removed here, so down count it as such
4043 if (presence.IsChildAgent)
4044 {
4045 m_sceneGraph.removeUserCount(false);
4046 }
4047 else
4048 {
4049 m_sceneGraph.removeUserCount(true);
4050 }
4051
4052 presence.ControllingClient.Close(); 4042 presence.ControllingClient.Close();
4053 return true; 4043 return true;
4054 } 4044 }