aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorUbitUmarov2016-07-27 23:39:50 +0100
committerUbitUmarov2016-07-27 23:39:50 +0100
commit376084a2e52561cfd1b359aabe9bb64ecc84c2fc (patch)
tree77052f68f03eb426b35fc7bd584eeadf9a4b34cf /bin
parent add another gatekeeper login fail reason reply (diff)
parentfirst step removing MegaRegions: refuse to run. Thanks to all that made MegaR... (diff)
downloadopensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.zip
opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.gz
opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.bz2
opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--bin/config-include/osslEnable.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 0a03d4c..8f9702d 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -157,6 +157,9 @@
157 ; ThreatLevel High 157 ; ThreatLevel High
158 Allow_osCauseDamage = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 158 Allow_osCauseDamage = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
159 Allow_osCauseHealing = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 159 Allow_osCauseHealing = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
160 Allow_osSetHealth = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
161 Allow_osSetHealRate = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
162 Allow_osGetHealRate = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
160 Allow_osForceAttachToAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 163 Allow_osForceAttachToAvatar = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
161 Allow_osForceAttachToAvatarFromInventory = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 164 Allow_osForceAttachToAvatarFromInventory = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER
162 Allow_osForceCreateLink = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER 165 Allow_osForceCreateLink = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER