diff options
| author | BlueWall | 2012-10-09 06:44:14 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-09 06:44:14 -0400 |
| commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
| tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /bin/OpenSimDefaults.ini | |
| parent | Added parts to manage repositories and plugin management (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 6e6a089..677ac74 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -427,6 +427,10 @@ | |||
| 427 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 427 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
| 428 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 428 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
| 429 | 429 | ||
| 430 | ; OpenSim can send multiple simultaneous requests for services such as asset | ||
| 431 | ; retrieval. However, some versions of mono appear to hang when there are too | ||
| 432 | ; many simultaneous requests, default is 30 and is currently applied only to assets | ||
| 433 | ;MaxRequestConcurrency = 30 | ||
| 430 | 434 | ||
| 431 | [XMLRPC] | 435 | [XMLRPC] |
| 432 | ; ## | 436 | ; ## |