diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /bin/OpenSimDefaults.ini | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c0c8134..05ea867 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -583,7 +583,7 @@ | |||
| 583 | ; clients login by starting each connection more slowly. Disabled by | 583 | ; clients login by starting each connection more slowly. Disabled by |
| 584 | ; default | 584 | ; default |
| 585 | ; | 585 | ; |
| 586 | enable_adaptive_throttles = true | 586 | enable_adaptive_throttles = false |
| 587 | 587 | ||
| 588 | ; Per-client bytes per second rates for the various throttle categories. | 588 | ; Per-client bytes per second rates for the various throttle categories. |
| 589 | ; These are default values that will be overridden by clients. These | 589 | ; These are default values that will be overridden by clients. These |
| @@ -1928,7 +1928,7 @@ | |||
| 1928 | GroupsCacheTimeout = 30 | 1928 | GroupsCacheTimeout = 30 |
| 1929 | 1929 | ||
| 1930 | ; Specify which messaging module to use for groups messaging and if it's enabled | 1930 | ; Specify which messaging module to use for groups messaging and if it's enabled |
| 1931 | MessagingModule = GroupsMessagingModule | 1931 | ;MessagingModule = GroupsMessagingModule |
| 1932 | ;MessagingEnabled = true | 1932 | ;MessagingEnabled = true |
| 1933 | 1933 | ||
| 1934 | ; Experimental option to only message cached online users rather than all users | 1934 | ; Experimental option to only message cached online users rather than all users |