diff options
author | UbitUmarov | 2016-11-08 11:22:08 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-08 11:22:08 +0000 |
commit | 6218913345ae22ef5c95fa71ee4f36f46c7a5644 (patch) | |
tree | 4c367b358f703c8b09145d007f1c6ab5b006993c /bin/OpenSimDefaults.ini | |
parent | partially revert commit f29d5ad662387b97d9e881f28df584dc19fa8c07: if mesh ass... (diff) | |
download | opensim-SC_OLD-6218913345ae22ef5c95fa71ee4f36f46c7a5644.zip opensim-SC_OLD-6218913345ae22ef5c95fa71ee4f36f46c7a5644.tar.gz opensim-SC_OLD-6218913345ae22ef5c95fa71ee4f36f46c7a5644.tar.bz2 opensim-SC_OLD-6218913345ae22ef5c95fa71ee4f36f46c7a5644.tar.xz |
add some configuration options missing in OpenSimDeafults.ini but present in OpenSim.ini.example
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSimDefaults.ini | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c4a01a6..6b04424 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -306,12 +306,23 @@ | |||
306 | 306 | ||
307 | DefaultScriptEngine = "XEngine" | 307 | DefaultScriptEngine = "XEngine" |
308 | 308 | ||
309 | ; Http proxy setting for llHTTPRequest and dynamic texture loading, if | ||
310 | ; required | ||
311 | ; HttpProxy = "http://proxy.com:8080" | ||
312 | |||
313 | ; If you're using HttpProxy, then you can set HttpProxyExceptions to a | ||
314 | ; list of regular expressions for URLs that you don't want to go through | ||
315 | ; the proxy. | ||
316 | ; For example, servers inside your firewall. | ||
317 | ; Separate patterns with a ';' | ||
318 | ; HttpProxyExceptions = ".mydomain.com;localhost" | ||
319 | |||
309 | ; ## | 320 | ; ## |
310 | ; ## EMAIL MODULE | 321 | ; ## EMAIL MODULE |
311 | ; ## | 322 | ; ## |
312 | 323 | ||
313 | ;emailmodule = DefaultEmailModule | 324 | ;emailmodule = DefaultEmailModule |
314 | 325 | ||
315 | ; ## | 326 | ; ## |
316 | ; ## ANIMATIONS | 327 | ; ## ANIMATIONS |
317 | ; ## | 328 | ; ## |
@@ -324,6 +335,10 @@ | |||
324 | ; won't look right until the physics engine supports it | 335 | ; won't look right until the physics engine supports it |
325 | ; (i.e delays takeoff for a moment) | 336 | ; (i.e delays takeoff for a moment) |
326 | 337 | ||
338 | ; # | ||
339 | ; # statistics | ||
340 | ; # | ||
341 | |||
327 | ; Simulator statistics are output to the console periodically at debug level INFO. | 342 | ; Simulator statistics are output to the console periodically at debug level INFO. |
328 | ; Setting this to zero disables this output. | 343 | ; Setting this to zero disables this output. |
329 | ; LogShowStatsSeconds = 3600 | 344 | ; LogShowStatsSeconds = 3600 |
@@ -362,6 +377,23 @@ | |||
362 | ; system with reduced logging | 377 | ; system with reduced logging |
363 | LogOverloads = True | 378 | LogOverloads = True |
364 | 379 | ||
380 | ; # | ||
381 | ; # Telehubs | ||
382 | ; # | ||
383 | |||
384 | ; SpawnPointRouting adjusts the landing for incoming avatars. | ||
385 | ; "closest" will place the avatar at the SpawnPoint located in the closest | ||
386 | ; available spot to the destination (typically map click/landmark). | ||
387 | ; "random" will place the avatar on a randomly selected spawnpoint; | ||
388 | ; "sequence" will place the avatar on the next sequential SpawnPoint | ||
389 | ; SpawnPointRouting = closest | ||
390 | |||
391 | ; TelehubAllowLandmark allows users with landmarks to override telehub | ||
392 | ; routing and land at the landmark coordinates when set to true | ||
393 | ; default is false | ||
394 | ; TelehubAllowLandmark = false | ||
395 | |||
396 | |||
365 | [Map] | 397 | [Map] |
366 | ;WorldMapModule = "WorldMap" | 398 | ;WorldMapModule = "WorldMap" |
367 | ;MapImageModule = "MapImageModule" | 399 | ;MapImageModule = "MapImageModule" |