From e4e58fad322c7e53ec725a616773294985332c7c Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 14 Apr 2015 07:17:54 -0700 Subject: [PATCH] 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. --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 3 +++ bin/OpenSim.ini.example | 2 +- 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 7ecaf55757..63755b8863 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 m_UrlModule = m_ScriptEngine.World.RequestModuleInterface(); if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) + { m_OSFunctionsEnabled = true; + m_log.Warn("[OSSL] OSSL FUNCTIONS ENABLED"); + } m_ScriptDelayFactor = m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index e911516f25..bb2cb12cd4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -964,7 +964,7 @@ ;# {Include-osslEnable} {} {Include file for enabling and permissions for OSSL functions} {} ;; Optionally include file to enable OSSL functions and set permissions on who can use which. ;; If this INI file is not included, the OSSL functions are disabled. - ; Include-osslEnable = "config-include/osslEnable.ini" + Include-osslEnable = "config-include/osslEnable.ini" [MRM] diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index ce0e2618e5..7c53ec0ec5 100755 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini @@ -88,7 +88,7 @@ Allow_osMax = true Allow_osMin = true Allow_osMovePen = true - Allow_osNpcGetOwner = true + Allow_osNpcGetOwner = ${XEngine|osslNPC} Allow_osParseJSON = true Allow_osParseJSONNew = true Allow_osSetFontName = true