aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2013-07-04 17:45:17 -0400
committerBlueWall2013-07-04 17:45:17 -0400
commitf2f33b75776539560e1dbfec12a6559f5b4be05e (patch)
treec9bd860f1298f01c4f64e8a9a50742ce10f008ed
parentGuard against completely unknown user UUIDs. (diff)
downloadopensim-SC_OLD-f2f33b75776539560e1dbfec12a6559f5b4be05e.zip
opensim-SC_OLD-f2f33b75776539560e1dbfec12a6559f5b4be05e.tar.gz
opensim-SC_OLD-f2f33b75776539560e1dbfec12a6559f5b4be05e.tar.bz2
opensim-SC_OLD-f2f33b75776539560e1dbfec12a6559f5b4be05e.tar.xz
Some consistency fixes for the ini to stop parser breakage
-rw-r--r--bin/OpenSim.ini.example16
1 files changed, 10 insertions, 6 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 3015c08..1c53935 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -268,7 +268,7 @@
268 ; AllowedClients = 268 ; AllowedClients =
269 269
270 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {} 270 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
271 ;# Bar (|) separated list of viewers which may not gain access to the regions. 271 ;; Bar (|) separated list of viewers which may not gain access to the regions.
272 ;; One can use a Substring of the viewer name to disable only certain 272 ;; One can use a Substring of the viewer name to disable only certain
273 ;; versions 273 ;; versions
274 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0" 274 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
@@ -287,7 +287,7 @@
287 ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/ 287 ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
288 ; GenerateMaptiles = true 288 ; GenerateMaptiles = true
289 289
290 ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule 290 ;# {MapImageModule} {} {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
291 ;; The module to use in order to generate map images. 291 ;; The module to use in order to generate map images.
292 ;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can 292 ;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can
293 ;; generate better images. 293 ;; generate better images.
@@ -474,7 +474,10 @@
474 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800 474 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
475 ;XmlRpcPort = 20800 475 ;XmlRpcPort = 20800
476 476
477 ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com 477
478;; {option} {depends on} {question to ask} {choices} default value
479
480 ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} {} http://example.com
478 ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator 481 ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
479 ;; will use this address to register xmlrpc channels on the external 482 ;; will use this address to register xmlrpc channels on the external
480 ;; service 483 ;; service
@@ -538,7 +541,7 @@
538 ;; Distance in meters that ordinary chat should travel. 541 ;; Distance in meters that ordinary chat should travel.
539 ; say_distance = 20 542 ; say_distance = 20
540 543
541 ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 544 ;# {shout_distance} {} {Distance at which a shout is heard, in meters?} {} 100
542 ;; Distance in meters that shouts should travel. 545 ;; Distance in meters that shouts should travel.
543 ; shout_distance = 100 546 ; shout_distance = 100
544 547
@@ -613,7 +616,8 @@
613 ;; the "password" parameter) 616 ;; the "password" parameter)
614 ; access_password = "" 617 ; access_password = ""
615 618
616 ;# List the IP addresses allowed to call RemoteAdmin 619 ;# {access_ip_addresses} {enabled:true} {List the IP addresses allowed to call RemoteAdmin?} {}
620 ;; List the IP addresses allowed to call RemoteAdmin
617 ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin. 621 ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin.
618 ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... 622 ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
619 ; access_ip_addresses = 623 ; access_ip_addresses =
@@ -798,7 +802,7 @@
798 ; ScriptStopStrategy = abort 802 ; ScriptStopStrategy = abort
799 803
800 804
801 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true 805 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} {true false} true
802 ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false 806 ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
803 ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 807 ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
804 ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used 808 ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used