diff options
| author | Melanie | 2012-10-20 02:33:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-20 02:33:24 +0100 |
| commit | 6ad8d3c43f130dfb80a7543e139ffa4dacb840ad (patch) | |
| tree | 24baeecab6becf3bb30c26046ea95b75e6bbdc0f /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Rename assetCache constructor param in UUIDGatherer to assetService wh... (diff) | |
| download | opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.zip opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.gz opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.bz2 opensim-SC_OLD-6ad8d3c43f130dfb80a7543e139ffa4dacb840ad.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 5 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 598016 -> 598016 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2753751 -> 2772750 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 764416 -> 764416 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 3031989 -> 3031835 bytes |
5 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 7d321a7..efcca70 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1573,6 +1573,11 @@ | |||
| 1573 | ;MessagingModule = GroupsMessagingModule | 1573 | ;MessagingModule = GroupsMessagingModule |
| 1574 | ;MessagingEnabled = true | 1574 | ;MessagingEnabled = true |
| 1575 | 1575 | ||
| 1576 | ; Experimental option to only message cached online users rather than all users | ||
| 1577 | ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service | ||
| 1578 | ; This currently only applies to the Flotsam XmlRpc backend | ||
| 1579 | MessageOnlineUsersOnly = false | ||
| 1580 | |||
| 1576 | ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend | 1581 | ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend |
| 1577 | 1582 | ||
| 1578 | ; SimianGrid Service for Groups | 1583 | ; SimianGrid Service for Groups |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 785f01f..f976efe 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index 6af2fb4..a00bc3a 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
| Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index e9e521a..acaa9c8 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
| Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index cbf4f79..996ea21 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||