diff options
author | Dan Lake | 2012-02-01 16:25:35 -0800 |
---|---|---|
committer | Dan Lake | 2012-02-01 16:25:35 -0800 |
commit | c10193c72b1f029a958f04d2f5d7ee384e693aaa (patch) | |
tree | 052ec7e973c15b158310511197affad14eb9c64f /bin/OpenSim.ini.example | |
parent | Trigger event when prims are scheduled for an update. This gives modules earl... (diff) | |
parent | Small optimization to last commit (diff) | |
download | opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.zip opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.gz opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.bz2 opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSim.ini.example')
-rwxr-xr-x | bin/OpenSim.ini.example | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d4e61a5..f9b405d 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | 37 | ||
38 | [Startup] | 38 | [Startup] |
39 | |||
39 | ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) " | 40 | ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) " |
40 | ;; Console prompt | 41 | ;; Console prompt |
41 | ;; Certain special characters can be used to customize the prompt | 42 | ;; Certain special characters can be used to customize the prompt |
@@ -170,9 +171,9 @@ | |||
170 | ; physics = basicphysics | 171 | ; physics = basicphysics |
171 | ; physics = POS | 172 | ; physics = POS |
172 | 173 | ||
173 | ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule | 174 | ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule |
174 | ;; Permission modules to use, separated by space. | 175 | ;; Permission modules to use, separated by comma. |
175 | ; permissionmodules = "DefaultPermissionsModule" | 176 | ; permissionmodules = DefaultPermissionsModule |
176 | 177 | ||
177 | ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true | 178 | ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true |
178 | ;; These are the parameters for the default permissions module | 179 | ;; These are the parameters for the default permissions module |