aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2017-04-05 01:15:44 +0100
committerUbitUmarov2017-04-05 01:15:44 +0100
commit2805cb9dec567cdfb7a25d771527510b7a6284af (patch)
treeb27cfe434f20dc5e59b1aa4f78b0e8c3e33f84b1
parentadd a little speedup on repeated requests for same name on osGetLinkNumber. (diff)
downloadopensim-SC_OLD-2805cb9dec567cdfb7a25d771527510b7a6284af.zip
opensim-SC_OLD-2805cb9dec567cdfb7a25d771527510b7a6284af.tar.gz
opensim-SC_OLD-2805cb9dec567cdfb7a25d771527510b7a6284af.tar.bz2
opensim-SC_OLD-2805cb9dec567cdfb7a25d771527510b7a6284af.tar.xz
give osTeleportObject proper OSFunctionThreatLevel setting on osslEnable.ini
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
-rw-r--r--bin/config-include/osslEnable.ini1
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 0275cf4..a6f6a80 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
4644 /// </remarks> 4644 /// </remarks>
4645 public void osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags) 4645 public void osTeleportObject(LSL_Key objectUUID, LSL_Vector targetPos, LSL_Rotation rotation, LSL_Integer flags)
4646 { 4646 {
4647 CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); 4647 CheckThreatLevel(ThreatLevel.Severe, "osTeleportObject");
4648 m_host.AddScriptLPS(1); 4648 m_host.AddScriptLPS(1);
4649 4649
4650 UUID objUUID; 4650 UUID objUUID;
4651 if (!UUID.TryParse(objectUUID, out objUUID)) 4651 if (!UUID.TryParse(objectUUID, out objUUID))
4652 { 4652 {
4653 OSSLShoutError("osObjectTeleport() invalid object Key"); 4653 OSSLShoutError("osTeleportObject() invalid object Key");
4654 return; 4654 return;
4655 } 4655 }
4656 4656
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 45eddf7..de5f957 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -236,4 +236,5 @@
236 Allow_osKickAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 236 Allow_osKickAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
237 Allow_osRevokeScriptPermissions = false 237 Allow_osRevokeScriptPermissions = false
238 Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 238 Allow_osTeleportAgent = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
239 Allow_osObjectTeleport = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
239 240