From 2805cb9dec567cdfb7a25d771527510b7a6284af Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 5 Apr 2017 01:15:44 +0100 Subject: [PATCH] give osTeleportObject proper OSFunctionThreatLevel setting on osslEnable.ini --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++-- bin/config-include/osslEnable.ini | 1 + 2 files changed, 3 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 0275cf4985..a6f6a80293 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -4644,13 +4644,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// public void osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags) { - CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); + CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject"); m_host.AddScriptLPS(1); UUID objUUID; if (!UUID.TryParse(objectUUID, out objUUID)) { - OSSLShoutError("osObjectTeleport() invalid object Key"); + OSSLShoutError("osTeleportObject() invalid object Key"); return; } diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index 45eddf748e..de5f957dfd 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini @@ -236,4 +236,5 @@ Allow_osKickAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER Allow_osRevokeScriptPermissions = false Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER + Allow_osObjectTeleport = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER