diff options
| author | Melanie | 2013-07-24 03:50:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-24 03:50:09 +0100 |
| commit | a7eb1b5b855b3caa6c4622789ef1377830e2f435 (patch) | |
| tree | 2bd58bcd2bd9b37adeb746f4b399b1d98539d1cf /bin | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.zip opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.gz opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.bz2 opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.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 f28dd3e..8055886 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1723,5 +1723,9 @@ MaxStringSpace = 0 | |||
| 1723 | ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} | 1723 | ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} |
| 1724 | MaxDistance = 100.0 | 1724 | MaxDistance = 100.0 |
| 1725 | 1725 | ||
| 1726 | [ServiceThrottle] | ||
| 1727 | ;; Default time interval (in ms) for the throttle service thread to wake up | ||
| 1728 | Interval = 5000 | ||
| 1729 | |||
| 1726 | [Modules] | 1730 | [Modules] |
| 1727 | Include-modules = "addon-modules/*/config/*.ini" | 1731 | Include-modules = "addon-modules/*/config/*.ini" |