aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-01-28 23:22:16 +0000
committerMelanie2011-01-28 23:22:16 +0000
commit38bfdb0c9d8946790a5e3a120283f29c04803269 (patch)
tree9746c6ac41044b7e66fefd85b1ddf6f263f847c0 /bin
parentAdd the prim count interfaces (diff)
parentComment out unused call to GridService in TeleportAgent() (diff)
downloadopensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.zip
opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.tar.gz
opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.tar.bz2
opensim-SC-38bfdb0c9d8946790a5e3a120283f29c04803269.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9028453..475d4a0 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1186,6 +1186,11 @@
1186 ; This makes the Groups modules very chatty on the console. 1186 ; This makes the Groups modules very chatty on the console.
1187 DebugEnabled = false 1187 DebugEnabled = false
1188 1188
1189 ; Groups data is cached for this number of seconds before another request is made to the groups service
1190 ; Set to 0 to disable the cache.
1191 ; Default is 30 seconds
1192 GroupsCacheTimeout = 30
1193
1189 ; Specify which messaging module to use for groups messaging and if it's enabled 1194 ; Specify which messaging module to use for groups messaging and if it's enabled
1190 ;MessagingModule = GroupsMessagingModule 1195 ;MessagingModule = GroupsMessagingModule
1191 ;MessagingEnabled = true 1196 ;MessagingEnabled = true