OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

cpu-performance
Diva Canto 2013-07-04 14:51:55 -07:00
parent 8265a88c4a f2f33b7577
commit c4506cf4f3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/OpenSim.ini.example
View File

@ -268,7 +268,7 @@
; AllowedClients = ; AllowedClients =
;# {BannedClients} {} {Bar (|) separated list of banned clients} {} ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
;# Bar (|) separated list of viewers which may not gain access to the regions. ;; Bar (|) separated list of viewers which may not gain access to the regions.
;; One can use a Substring of the viewer name to disable only certain ;; One can use a Substring of the viewer name to disable only certain
;; versions ;; versions
;; Example: Agent uses the viewer "Imprudence 1.3.2.0" ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
@ -287,7 +287,7 @@
;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/ ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
; GenerateMaptiles = true ; GenerateMaptiles = true
;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule ;# {MapImageModule} {} {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
;; The module to use in order to generate map images. ;; The module to use in order to generate map images.
;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can ;; MapImageModule is the default. Warp3DImageModule is an alternative experimental module that can
;; generate better images. ;; generate better images.
@ -474,7 +474,10 @@
;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
;XmlRpcPort = 20800 ;XmlRpcPort = 20800
;# {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
;; {option} {depends on} {question to ask} {choices} default value
;# {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
;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
;; will use this address to register xmlrpc channels on the external ;; will use this address to register xmlrpc channels on the external
;; service ;; service
@ -538,7 +541,7 @@
;; Distance in meters that ordinary chat should travel. ;; Distance in meters that ordinary chat should travel.
; say_distance = 20 ; say_distance = 20
;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100 ;# {shout_distance} {} {Distance at which a shout is heard, in meters?} {} 100
;; Distance in meters that shouts should travel. ;; Distance in meters that shouts should travel.
; shout_distance = 100 ; shout_distance = 100
@ -613,7 +616,8 @@
;; the "password" parameter) ;; the "password" parameter)
; access_password = "" ; access_password = ""
;# List the IP addresses allowed to call RemoteAdmin ;# {access_ip_addresses} {enabled:true} {List the IP addresses allowed to call RemoteAdmin?} {}
;; List the IP addresses allowed to call RemoteAdmin
;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin. ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin.
;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
; access_ip_addresses = ; access_ip_addresses =
@ -798,7 +802,7 @@
; ScriptStopStrategy = abort ; ScriptStopStrategy = abort
;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} {true false} true
;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used