aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2009-08-19 04:40:57 +0100
committerMelanie2009-08-19 04:40:57 +0100
commitc5bbcb04e039fc6261aca26b6ee73cf1d9cbe618 (patch)
treeda00f86b36dd18a9713d59ddf97587c238ecf823 /bin
parentAdd rest console support to the user server. Will ask new questions at (diff)
parentosGetLinkPrimitiveParams fix (diff)
downloadopensim-SC_OLD-c5bbcb04e039fc6261aca26b6ee73cf1d9cbe618.zip
opensim-SC_OLD-c5bbcb04e039fc6261aca26b6ee73cf1d9cbe618.tar.gz
opensim-SC_OLD-c5bbcb04e039fc6261aca26b6ee73cf1d9cbe618.tar.bz2
opensim-SC_OLD-c5bbcb04e039fc6261aca26b6ee73cf1d9cbe618.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9a17c58..cff5d19 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -374,6 +374,9 @@
374 ; 374 ;
375 ; client_socket_rcvbuf_size = 8388608 375 ; client_socket_rcvbuf_size = 8388608
376 376
377 ; Maximum bits per second to send to any single client. This will override the user's viewer preference settings.
378
379 ; client_throttle_max_bps = 1500000
377 380
378[Chat] 381[Chat]
379 ; Controls whether the chat module is enabled. Default is true. 382 ; Controls whether the chat module is enabled. Default is true.