diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-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 37766fb..04c3184 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2925,7 +2925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2925 | avatar.SpeedModifier = (float)SpeedModifier; | 2925 | avatar.SpeedModifier = (float)SpeedModifier; |
2926 | } | 2926 | } |
2927 | 2927 | ||
2928 | public void osKickAvatar(string FirstName,string SurName,string alert) | 2928 | public void osKickAvatar(string FirstName, string SurName, string alert) |
2929 | { | 2929 | { |
2930 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 2930 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
2931 | m_host.AddScriptLPS(1); | 2931 | m_host.AddScriptLPS(1); |
@@ -2939,7 +2939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2939 | sp.ControllingClient.Kick(alert); | 2939 | sp.ControllingClient.Kick(alert); |
2940 | 2940 | ||
2941 | // ...and close on our side | 2941 | // ...and close on our side |
2942 | sp.Scene.IncomingCloseAgent(sp.UUID); | 2942 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
2943 | } | 2943 | } |
2944 | }); | 2944 | }); |
2945 | } | 2945 | } |