diff options
| author | Melanie | 2012-10-07 02:48:28 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-07 02:48:28 +0100 |
| commit | f7df68d922758c0a78664abe82d631579f6aa63f (patch) | |
| tree | 85daa41ff4b35653b4fbb987cbc852ad853decef /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff) | |
| download | opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.zip opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2 opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'bin')
| -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 042fd3a..f4d9021 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -423,6 +423,10 @@ | |||
| 423 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 423 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
| 424 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 424 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
| 425 | 425 | ||
| 426 | ; OpenSim can send multiple simultaneous requests for services such as asset | ||
| 427 | ; retrieval. However, some versions of mono appear to hang when there are too | ||
| 428 | ; many simultaneous requests, default is 30 and is currently applied only to assets | ||
| 429 | ;MaxRequestConcurrency = 30 | ||
| 426 | 430 | ||
| 427 | [XMLRPC] | 431 | [XMLRPC] |
| 428 | ; ## | 432 | ; ## |