diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 3 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 2 | ||||
-rwxr-xr-x | bin/config-include/osslEnable.ini | 2 |
3 files changed, 5 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 7ecaf55..63755b8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -153,7 +153,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
153 | m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); | 153 | m_UrlModule = m_ScriptEngine.World.RequestModuleInterface<IUrlModule>(); |
154 | 154 | ||
155 | if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) | 155 | if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) |
156 | { | ||
156 | m_OSFunctionsEnabled = true; | 157 | m_OSFunctionsEnabled = true; |
158 | m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); | ||
159 | } | ||
157 | 160 | ||
158 | m_ScriptDelayFactor = | 161 | m_ScriptDelayFactor = |
159 | m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); | 162 | m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index e911516..bb2cb12 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -964,7 +964,7 @@ | |||
964 | ;# {Include-osslEnable} {} {Include file for enabling and permissions for OSSL functions} {} | 964 | ;# {Include-osslEnable} {} {Include file for enabling and permissions for OSSL functions} {} |
965 | ;; Optionally include file to enable OSSL functions and set permissions on who can use which. | 965 | ;; Optionally include file to enable OSSL functions and set permissions on who can use which. |
966 | ;; If this INI file is not included, the OSSL functions are disabled. | 966 | ;; If this INI file is not included, the OSSL functions are disabled. |
967 | ; Include-osslEnable = "config-include/osslEnable.ini" | 967 | Include-osslEnable = "config-include/osslEnable.ini" |
968 | 968 | ||
969 | 969 | ||
970 | [MRM] | 970 | [MRM] |
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index ce0e261..7c53ec0 100755 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
@@ -88,7 +88,7 @@ | |||
88 | Allow_osMax = true | 88 | Allow_osMax = true |
89 | Allow_osMin = true | 89 | Allow_osMin = true |
90 | Allow_osMovePen = true | 90 | Allow_osMovePen = true |
91 | Allow_osNpcGetOwner = true | 91 | Allow_osNpcGetOwner = ${XEngine|osslNPC} |
92 | Allow_osParseJSON = true | 92 | Allow_osParseJSON = true |
93 | Allow_osParseJSONNew = true | 93 | Allow_osParseJSONNew = true |
94 | Allow_osSetFontName = true | 94 | Allow_osSetFontName = true |