aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorCharles Krinke2008-08-29 14:21:31 +0000
committerCharles Krinke2008-08-29 14:21:31 +0000
commit9fc67f1908ed0a4b5d2924c118d4b941e50a0e8f (patch)
tree7597316a53763d569dddf64ccf0e3b940c9e0362 /OpenSim/Region/Environment/Scenes
parentFix an issue where the client supplies an empty name and it was applied (diff)
downloadopensim-SC-9fc67f1908ed0a4b5d2924c118d4b941e50a0e8f.zip
opensim-SC-9fc67f1908ed0a4b5d2924c118d4b941e50a0e8f.tar.gz
opensim-SC-9fc67f1908ed0a4b5d2924c118d4b941e50a0e8f.tar.bz2
opensim-SC-9fc67f1908ed0a4b5d2924c118d4b941e50a0e8f.tar.xz
Mantis#2067. Thank you kindly, HomerHorwitz for a patch that:
Found that during my ghost-hunt: Add some logging and you see that the counting down happens twice (once at the place that is removed by the patch, and once caused by the actual removal of the root-/child-agent during LLClientView.Close). With the patch applied, I end up with correct numbers, i.e. with 0 roots and 0 children after everyone has logged out.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs17
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0bd0028..2b8bbbd 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2767,14 +2767,15 @@ namespace OpenSim.Region.Environment.Scenes
2767 ScenePresence presence = m_innerScene.GetScenePresence(agentID); 2767 ScenePresence presence = m_innerScene.GetScenePresence(agentID);
2768 if (presence != null) 2768 if (presence != null)
2769 { 2769 {
2770 if (presence.IsChildAgent) 2770 // Nothing is removed here, so down count it as such
2771 { 2771 // if (presence.IsChildAgent)
2772 m_innerScene.removeUserCount(false); 2772 // {
2773 } 2773 // m_innerScene.removeUserCount(false);
2774 else 2774 // }
2775 { 2775 // else
2776 m_innerScene.removeUserCount(true); 2776 // {
2777 } 2777 // m_innerScene.removeUserCount(true);
2778 // }
2778 2779
2779 // Tell a single agent to disconnect from the region. 2780 // Tell a single agent to disconnect from the region.
2780 presence.ControllingClient.SendShutdownConnectionNotice(); 2781 presence.ControllingClient.SendShutdownConnectionNotice();