diff options
author | Justin Clark-Casey (justincc) | 2012-08-20 20:24:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-20 20:24:54 +0100 |
commit | bcbd450fe441e94d6c0f547055b4e95f75a5b0d0 (patch) | |
tree | ad92a6256830933073261fe0f715b006fd94c341 /OpenSim/Region/ScriptEngine | |
parent | Fix scripted detach of temp attachments (diff) | |
download | opensim-SC-bcbd450fe441e94d6c0f547055b4e95f75a5b0d0.zip opensim-SC-bcbd450fe441e94d6c0f547055b4e95f75a5b0d0.tar.gz opensim-SC-bcbd450fe441e94d6c0f547055b4e95f75a5b0d0.tar.bz2 opensim-SC-bcbd450fe441e94d6c0f547055b4e95f75a5b0d0.tar.xz |
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 8936cb2..1e8b51b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2877,7 +2877,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2877 | avatar.SpeedModifier = (float)SpeedModifier; | 2877 | avatar.SpeedModifier = (float)SpeedModifier; |
2878 | } | 2878 | } |
2879 | 2879 | ||
2880 | public void osKickAvatar(string FirstName,string SurName,string alert) | 2880 | public void osKickAvatar(string FirstName, string SurName, string alert) |
2881 | { | 2881 | { |
2882 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 2882 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
2883 | m_host.AddScriptLPS(1); | 2883 | m_host.AddScriptLPS(1); |
@@ -2891,7 +2891,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2891 | sp.ControllingClient.Kick(alert); | 2891 | sp.ControllingClient.Kick(alert); |
2892 | 2892 | ||
2893 | // ...and close on our side | 2893 | // ...and close on our side |
2894 | sp.Scene.IncomingCloseAgent(sp.UUID); | 2894 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
2895 | } | 2895 | } |
2896 | }); | 2896 | }); |
2897 | } | 2897 | } |