aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorBlueWall2012-10-20 04:32:45 -0400
committerBlueWall2012-10-20 04:32:45 -0400
commitaf9cd7d30cc3926242338da2ed66c7cc444c6240 (patch)
tree80d8eea5b0d6d70deeb65ae6d6736648110f15b4 /bin
parentAdd CLICK_ACTION_ZOOM (diff)
parentminor: remove unnecessary bit of method doc from OdePrim.BadMeshAssetCollideB... (diff)
downloadopensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.zip
opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.tar.gz
opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.tar.bz2
opensim-SC-af9cd7d30cc3926242338da2ed66c7cc444c6240.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/OpenSimDefaults.ini5
-rwxr-xr-xbin/lib32/BulletSim.dllbin598016 -> 598016 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2753751 -> 2772750 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin764416 -> 764416 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin3031989 -> 3031835 bytes
5 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b99a02e..dffc0ac 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1577,6 +1577,11 @@
1577 MessagingModule = GroupsMessagingModule 1577 MessagingModule = GroupsMessagingModule
1578 ;MessagingEnabled = true 1578 ;MessagingEnabled = true
1579 1579
1580 ; Experimental option to only message cached online users rather than all users
1581 ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
1582 ; This currently only applies to the Flotsam XmlRpc backend
1583 MessageOnlineUsersOnly = false
1584
1580 ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend 1585 ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
1581 1586
1582 ; SimianGrid Service for Groups 1587 ; 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