diff options
| author | Dan Lake | 2013-07-17 15:06:25 -0700 |
|---|---|---|
| committer | Dan Lake | 2013-07-17 15:06:25 -0700 |
| commit | 49b3b7ee832bfd71d736773e7499158b068c3cae (patch) | |
| tree | 5ba499399e8a00e8aebfb136203821ce17eebe0e /bin | |
| parent | command line kick user now uses exact name match instead of substring search ... (diff) | |
| parent | This is a completely unreasonable thing to do, effectively defying the purpos... (diff) | |
| download | opensim-SC_OLD-49b3b7ee832bfd71d736773e7499158b068c3cae.zip opensim-SC_OLD-49b3b7ee832bfd71d736773e7499158b068c3cae.tar.gz opensim-SC_OLD-49b3b7ee832bfd71d736773e7499158b068c3cae.tar.bz2 opensim-SC_OLD-49b3b7ee832bfd71d736773e7499158b068c3cae.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
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 4a3104e..8079632 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1727,5 +1727,9 @@ MaxStringSpace = 0 | |||
| 1727 | ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} | 1727 | ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0} |
| 1728 | MaxDistance = 100.0 | 1728 | MaxDistance = 100.0 |
| 1729 | 1729 | ||
| 1730 | [ServiceThrottle] | ||
| 1731 | ;; Default time interval (in ms) for the throttle service thread to wake up | ||
| 1732 | Interval = 5000 | ||
| 1733 | |||
| 1730 | [Modules] | 1734 | [Modules] |
| 1731 | Include-modules = "addon-modules/*/config/*.ini" | 1735 | Include-modules = "addon-modules/*/config/*.ini" |