diff options
author | Melanie | 2011-10-12 09:26:35 +0100 |
---|---|---|
committer | Melanie | 2011-10-12 09:26:35 +0100 |
commit | d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd (patch) | |
tree | b7ec103d17b544a614bf6159b6631ad5f96f8ebf /bin | |
parent | Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken (diff) | |
parent | Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled (diff) | |
download | opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.zip opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.gz opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.bz2 opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.xz |
Merge branch 'master' into bigmerge
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9cedd98..9685467 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -1377,7 +1377,7 @@ | |||
1377 | GroupsCacheTimeout = 30 | 1377 | GroupsCacheTimeout = 30 |
1378 | 1378 | ||
1379 | ; Specify which messaging module to use for groups messaging and if it's enabled | 1379 | ; Specify which messaging module to use for groups messaging and if it's enabled |
1380 | ;MessagingModule = GroupsMessagingModule | 1380 | MessagingModule = GroupsMessagingModule |
1381 | ;MessagingEnabled = true | 1381 | ;MessagingEnabled = true |
1382 | 1382 | ||
1383 | ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend | 1383 | ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend |