aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorUbitUmarov2016-12-18 05:03:27 +0000
committerUbitUmarov2016-12-18 05:03:27 +0000
commit82fc8e1a36778a59d4d9c329ea71a60c3f4e8729 (patch)
tree65b5fbfe80c9db6547b2693b04544de18647f7bd /bin/config-include
parentMerge branch 'master' into httptests (diff)
parentleave stupid broken permissions alone (diff)
downloadopensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.zip
opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.tar.gz
opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.tar.bz2
opensim-SC-82fc8e1a36778a59d4d9c329ea71a60c3f4e8729.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--bin/config-include/osslEnable.ini5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 59a162a..a064f09 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -139,8 +139,9 @@
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 142 Allow_osNpcSetProfileAbout = ${XEngine|osslNPC}
143 Allow_osNpcSetProfileImage = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER 143 Allow_osNpcSetProfileImage = ${XEngine|osslNPC}
144 Allow_osDie = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
144 145
145 ; ThreatLevel Moderate 146 ; ThreatLevel Moderate
146 Allow_osDropAttachment = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 147 Allow_osDropAttachment = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER