diff options
author | Melanie | 2012-03-22 23:01:50 +0000 |
---|---|---|
committer | Melanie | 2012-03-22 23:01:50 +0000 |
commit | 9edf99703a572b43c5d51cd28fbe142220addf6b (patch) | |
tree | 525d57aff7c50959d9182c28f28872cb94438e7d /bin | |
parent | Fix merge issue from core (diff) | |
parent | HG Friends: don't notify if the server isn't there. (diff) | |
download | opensim-SC-9edf99703a572b43c5d51cd28fbe142220addf6b.zip opensim-SC-9edf99703a572b43c5d51cd28fbe142220addf6b.tar.gz opensim-SC-9edf99703a572b43c5d51cd28fbe142220addf6b.tar.bz2 opensim-SC-9edf99703a572b43c5d51cd28fbe142220addf6b.tar.xz |
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/OpenSim.ini.example | 9 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2c85f9d..50366a6 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -194,6 +194,15 @@ | |||
194 | ; region_manager_is_god = false | 194 | ; region_manager_is_god = false |
195 | ; parcel_owner_is_god = true | 195 | ; parcel_owner_is_god = true |
196 | 196 | ||
197 | ;; More control over permissions | ||
198 | ;; This is definitely not SL! | ||
199 | ; Provides a simple control for land owners to give build rights to specific avatars | ||
200 | ; in publicly accessible parcels that disallow object creation in general. | ||
201 | ; Owners specific avatars by adding them to the Access List of the parcel | ||
202 | ; without having to use the Groups feature | ||
203 | ; simple_build_permissions = false | ||
204 | |||
205 | |||
197 | ;; Default script engine to use. Currently, we only have XEngine | 206 | ;; Default script engine to use. Currently, we only have XEngine |
198 | ; DefaultScriptEngine = "XEngine" | 207 | ; DefaultScriptEngine = "XEngine" |
199 | 208 | ||
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index f4e3d9e..8be2427 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -260,6 +260,14 @@ | |||
260 | ; Default value is all | 260 | ; Default value is all |
261 | ; allowed_script_editors = all | 261 | ; allowed_script_editors = all |
262 | 262 | ||
263 | ; Provides a simple control for land owners to give build rights to specific avatars | ||
264 | ; in publicly accessible parcels that disallow object creation in general. | ||
265 | ; Owners specific avatars by adding them to the Access List of the parcel | ||
266 | ; without having to use the Groups feature | ||
267 | ; Disabled by default | ||
268 | ; simple_build_permissions = False | ||
269 | |||
270 | |||
263 | ; ## | 271 | ; ## |
264 | ; ## SCRIPT ENGINE | 272 | ; ## SCRIPT ENGINE |
265 | ; ## | 273 | ; ## |