aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-08 00:18:25 +0100
committerJustin Clark-Casey (justincc)2012-06-08 00:18:25 +0100
commitb56673c920603022fce9cb479b714f6fbd0f1311 (patch)
tree5ec835ceeba54c1658fb888bed781994a45487c5 /OpenSim/Region/Application/OpenSim.cs
parentRecord the fact that child agents can have asset transactions. (diff)
downloadopensim-SC_OLD-b56673c920603022fce9cb479b714f6fbd0f1311.zip
opensim-SC_OLD-b56673c920603022fce9cb479b714f6fbd0f1311.tar.gz
opensim-SC_OLD-b56673c920603022fce9cb479b714f6fbd0f1311.tar.bz2
opensim-SC_OLD-b56673c920603022fce9cb479b714f6fbd0f1311.tar.xz
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()
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
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
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 // ...and close on our side 489 presence.ControllingClient.Close();
490 presence.Scene.IncomingCloseAgent(presence.UUID);
491 } 490 }
492 } 491 }
492
493 MainConsole.Instance.Output(""); 493 MainConsole.Instance.Output("");
494 } 494 }
495 495