aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorRobert Adams2015-04-14 07:17:54 -0700
committerRobert Adams2015-04-14 07:17:54 -0700
commite4e58fad322c7e53ec725a616773294985332c7c (patch)
tree4bffa693e619c77cfc8bc226fd242c690056aba8 /bin
parentRemove ossl settings in XEngine section of OpenSim.ini.example with note to w... (diff)
downloadopensim-SC_OLD-e4e58fad322c7e53ec725a616773294985332c7c.zip
opensim-SC_OLD-e4e58fad322c7e53ec725a616773294985332c7c.tar.gz
opensim-SC_OLD-e4e58fad322c7e53ec725a616773294985332c7c.tar.bz2
opensim-SC_OLD-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 '')
-rw-r--r--bin/OpenSim.ini.example2
-rwxr-xr-xbin/config-include/osslEnable.ini2
2 files changed, 2 insertions, 2 deletions
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