From cae513f3ed4adfbc1630206f4b3d02461ec063ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 7 Nov 2016 12:51:37 +1000 Subject: Remove silly rezzing distance limits. They just make scripters work around them. --- .../OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 2 -- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 +----- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ---- config/OpenSimDefaults.ini | 3 --- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs index edf51a2..01de21c 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs @@ -728,8 +728,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore // hpos = host.RootPart.GetWorldPosition() // float dist = (float)llVecDist(hpos, pos); - // if (dist > m_ScriptDistanceFactor * 10.0f) - // return; TaskInventoryItem item = host.RootPart.Inventory.GetInventoryItem(name); if (item == null) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c195405..0b60aee 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2278,8 +2278,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api pos.x < -10.0 || // return FALSE if more than 10 meters into a west-adjacent region. pos.x > (World.RegionInfo.RegionSizeX + 10) || // return FALSE if more than 10 meters into a east-adjacent region. pos.y < -10.0 || // return FALSE if more than 10 meters into a south-adjacent region. - pos.y > (World.RegionInfo.RegionSizeY + 10) || // return FALSE if more than 10 meters into a north-adjacent region. - pos.z > Constants.RegionHeight // return FALSE if altitude than 4096m + pos.y > (World.RegionInfo.RegionSizeY + 10) // return FALSE if more than 10 meters into a north-adjacent region. ) ) { @@ -3099,9 +3098,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api float dist = (float)llVecDist(llGetPos(), pos); - if (dist > m_ScriptDistanceFactor * 10.0f) - return; - TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory); if (item == null) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 846c8db..6202a5c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -138,7 +138,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api internal TaskInventoryItem m_item; internal bool m_OSFunctionsEnabled = false; internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; - internal float m_ScriptDistanceFactor = 1.0f; internal Dictionary m_FunctionPerms = new Dictionary(); protected IUrlModule m_UrlModule = null; @@ -158,9 +157,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); } - m_ScriptDistanceFactor = - m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); - string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); switch (risk) { diff --git a/config/OpenSimDefaults.ini b/config/OpenSimDefaults.ini index e0957e3..9923c82 100644 --- a/config/OpenSimDefaults.ini +++ b/config/OpenSimDefaults.ini @@ -1762,9 +1762,6 @@ ; before aborting the thread (such as when an object containing scripts is taken into inventory). WaitForEventCompletionOnScriptStop = 1000; - ; The factor the 10 m distances llimits are multiplied by - ScriptDistanceLimitFactor = 1.0 - ; Maximum length of notecard line read ; Increasing this to large values potentially opens ; up the system to malicious scripters -- cgit v1.1