aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorUbitUmarov2016-12-14 13:35:53 +0000
committerUbitUmarov2016-12-14 13:35:53 +0000
commit18a292ad02e590619760a71aeb1514e6916b257f (patch)
tree584faa43265cc20ee36d92b2bc14cb1c55435ef0 /bin/config-include
parentMerge branch 'master' into httptests (diff)
parentfix: check for region_handle before region_id, viewers are so funny.. (diff)
downloadopensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.zip
opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.gz
opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.bz2
opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--bin/config-include/osslEnable.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 4c6be16..59a162a 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -139,6 +139,8 @@
139 Allow_osMessageObject = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 139 Allow_osMessageObject = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
140 Allow_osRegexIsMatch = true 140 Allow_osRegexIsMatch = true
141 Allow_osGetAvatarHomeURI = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 141 Allow_osGetAvatarHomeURI = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
142 Allow_osNpcSetProfileAbout = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
143 Allow_osNpcSetProfileImage = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
142 144
143 ; ThreatLevel Moderate 145 ; ThreatLevel Moderate
144 Allow_osDropAttachment = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 146 Allow_osDropAttachment = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER