aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-20 20:24:54 +0100
committerJustin Clark-Casey (justincc)2012-08-24 21:52:21 +0100
commit3b972417167e2c5d3aa7b2d390a5be68e5509dc5 (patch)
treef9422c2103cf67345324dd7d22fe2f8570231340 /OpenSim/Region/ScriptEngine/Shared
parentFix llDialog responses so that they can be heard throughout the region. This ... (diff)
downloadopensim-SC_OLD-3b972417167e2c5d3aa7b2d390a5be68e5509dc5.zip
opensim-SC_OLD-3b972417167e2c5d3aa7b2d390a5be68e5509dc5.tar.gz
opensim-SC_OLD-3b972417167e2c5d3aa7b2d390a5be68e5509dc5.tar.bz2
opensim-SC_OLD-3b972417167e2c5d3aa7b2d390a5be68e5509dc5.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/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
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 859ee93..8b6f76b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2881,7 +2881,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2881 avatar.SpeedModifier = (float)SpeedModifier; 2881 avatar.SpeedModifier = (float)SpeedModifier;
2882 } 2882 }
2883 2883
2884 public void osKickAvatar(string FirstName,string SurName,string alert) 2884 public void osKickAvatar(string FirstName, string SurName, string alert)
2885 { 2885 {
2886 CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); 2886 CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
2887 m_host.AddScriptLPS(1); 2887 m_host.AddScriptLPS(1);
@@ -2895,7 +2895,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2895 sp.ControllingClient.Kick(alert); 2895 sp.ControllingClient.Kick(alert);
2896 2896
2897 // ...and close on our side 2897 // ...and close on our side
2898 sp.Scene.IncomingCloseAgent(sp.UUID); 2898 sp.Scene.IncomingCloseAgent(sp.UUID, false);
2899 } 2899 }
2900 }); 2900 });
2901 } 2901 }