diff options
author | David Walter Seikel | 2016-11-07 12:51:37 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-07 12:51:37 +1000 |
commit | cae513f3ed4adfbc1630206f4b3d02461ec063ad (patch) | |
tree | ac4fec24a7fdf79ff2d56d5a9d5d2b533d7f6ea7 | |
parent | More caches directory fixes, including moving console history there. (diff) | |
download | opensim-SC_OLD-cae513f3ed4adfbc1630206f4b3d02461ec063ad.zip opensim-SC_OLD-cae513f3ed4adfbc1630206f4b3d02461ec063ad.tar.gz opensim-SC_OLD-cae513f3ed4adfbc1630206f4b3d02461ec063ad.tar.bz2 opensim-SC_OLD-cae513f3ed4adfbc1630206f4b3d02461ec063ad.tar.xz |
Remove silly rezzing distance limits. They just make scripters work around them.
Diffstat (limited to '')
4 files changed, 1 insertions, 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 | |||
728 | 728 | ||
729 | // hpos = host.RootPart.GetWorldPosition() | 729 | // hpos = host.RootPart.GetWorldPosition() |
730 | // float dist = (float)llVecDist(hpos, pos); | 730 | // float dist = (float)llVecDist(hpos, pos); |
731 | // if (dist > m_ScriptDistanceFactor * 10.0f) | ||
732 | // return; | ||
733 | 731 | ||
734 | TaskInventoryItem item = host.RootPart.Inventory.GetInventoryItem(name); | 732 | TaskInventoryItem item = host.RootPart.Inventory.GetInventoryItem(name); |
735 | if (item == null) | 733 | 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 | |||
2278 | pos.x < -10.0 || // return FALSE if more than 10 meters into a west-adjacent region. | 2278 | pos.x < -10.0 || // return FALSE if more than 10 meters into a west-adjacent region. |
2279 | pos.x > (World.RegionInfo.RegionSizeX + 10) || // return FALSE if more than 10 meters into a east-adjacent region. | 2279 | pos.x > (World.RegionInfo.RegionSizeX + 10) || // return FALSE if more than 10 meters into a east-adjacent region. |
2280 | pos.y < -10.0 || // return FALSE if more than 10 meters into a south-adjacent region. | 2280 | pos.y < -10.0 || // return FALSE if more than 10 meters into a south-adjacent region. |
2281 | pos.y > (World.RegionInfo.RegionSizeY + 10) || // return FALSE if more than 10 meters into a north-adjacent region. | 2281 | pos.y > (World.RegionInfo.RegionSizeY + 10) // return FALSE if more than 10 meters into a north-adjacent region. |
2282 | pos.z > Constants.RegionHeight // return FALSE if altitude than 4096m | ||
2283 | ) | 2282 | ) |
2284 | ) | 2283 | ) |
2285 | { | 2284 | { |
@@ -3099,9 +3098,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3099 | 3098 | ||
3100 | float dist = (float)llVecDist(llGetPos(), pos); | 3099 | float dist = (float)llVecDist(llGetPos(), pos); |
3101 | 3100 | ||
3102 | if (dist > m_ScriptDistanceFactor * 10.0f) | ||
3103 | return; | ||
3104 | |||
3105 | TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory); | 3101 | TaskInventoryItem item = m_host.Inventory.GetInventoryItem(inventory); |
3106 | 3102 | ||
3107 | if (item == null) | 3103 | 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 | |||
138 | internal TaskInventoryItem m_item; | 138 | internal TaskInventoryItem m_item; |
139 | internal bool m_OSFunctionsEnabled = false; | 139 | internal bool m_OSFunctionsEnabled = false; |
140 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; | 140 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; |
141 | internal float m_ScriptDistanceFactor = 1.0f; | ||
142 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); | 141 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); |
143 | 142 | ||
144 | protected IUrlModule m_UrlModule = null; | 143 | protected IUrlModule m_UrlModule = null; |
@@ -158,9 +157,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
158 | // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); | 157 | // m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); |
159 | } | 158 | } |
160 | 159 | ||
161 | m_ScriptDistanceFactor = | ||
162 | m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); | ||
163 | |||
164 | string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); | 160 | string risk = m_ScriptEngine.Config.GetString("OSFunctionThreatLevel", "VeryLow"); |
165 | switch (risk) | 161 | switch (risk) |
166 | { | 162 | { |
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 @@ | |||
1762 | ; before aborting the thread (such as when an object containing scripts is taken into inventory). | 1762 | ; before aborting the thread (such as when an object containing scripts is taken into inventory). |
1763 | WaitForEventCompletionOnScriptStop = 1000; | 1763 | WaitForEventCompletionOnScriptStop = 1000; |
1764 | 1764 | ||
1765 | ; The factor the 10 m distances llimits are multiplied by | ||
1766 | ScriptDistanceLimitFactor = 1.0 | ||
1767 | |||
1768 | ; Maximum length of notecard line read | 1765 | ; Maximum length of notecard line read |
1769 | ; Increasing this to large values potentially opens | 1766 | ; Increasing this to large values potentially opens |
1770 | ; up the system to malicious scripters | 1767 | ; up the system to malicious scripters |