aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorRobert Adams2015-04-14 07:17:54 -0700
committerRobert Adams2015-04-14 07:17:54 -0700
commite4e58fad322c7e53ec725a616773294985332c7c (patch)
tree4bffa693e619c77cfc8bc226fd242c690056aba8 /OpenSim/Region
parentRemove ossl settings in XEngine section of OpenSim.ini.example with note to w... (diff)
downloadopensim-SC-e4e58fad322c7e53ec725a616773294985332c7c.zip
opensim-SC-e4e58fad322c7e53ec725a616773294985332c7c.tar.gz
opensim-SC-e4e58fad322c7e53ec725a616773294985332c7c.tar.bz2
opensim-SC-e4e58fad322c7e53ec725a616773294985332c7c.tar.xz
Enable OSSL functions by default using the osslEnable.ini configuration file.
This changes OpenSim.ini.example to, by default, include osslEnable.ini which turns on the OSSL functions and limits who can do which operations.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs3
1 files changed, 3 insertions, 0 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);