diff options
| author | Justin Clark-Casey (justincc) | 2013-02-09 01:11:41 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-09 01:11:41 +0000 |
| commit | 6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b (patch) | |
| tree | 647e2ce5747ad8992111e9e89aefa825bffbbef2 /bin | |
| parent | Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that ... (diff) | |
| parent | BulletSim: add parameter to set global contact breaking threshold. Update DLL... (diff) | |
| download | opensim-SC_OLD-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.zip opensim-SC_OLD-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.tar.gz opensim-SC_OLD-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.tar.bz2 opensim-SC_OLD-6935bec0ab83f25f69ad08e9bbc4b8d98aac1b1b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 546304 -> 546816 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1695269 -> 1695699 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 694272 -> 694272 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1841657 -> 1842163 bytes |
5 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 7bdfd1c..2512428 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1652,6 +1652,10 @@ | |||
| 1652 | [JsonStore] | 1652 | [JsonStore] |
| 1653 | Enabled = False | 1653 | Enabled = False |
| 1654 | 1654 | ||
| 1655 | ;; Enable direct access to the SOP dynamic attributes | ||
| 1656 | EnableObjectStore = False | ||
| 1657 | MaxStringSpace = 0 | ||
| 1658 | |||
| 1655 | ;; | 1659 | ;; |
| 1656 | ;; These are defaults that are overwritten below in [Architecture]. | 1660 | ;; These are defaults that are overwritten below in [Architecture]. |
| 1657 | ;; These defaults allow OpenSim to work out of the box with | 1661 | ;; These defaults allow OpenSim to work out of the box with |
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index de4f95a..4dd2f38 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 674a08a..cb8742a 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 1c55b19..c9f5814 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 e2fc8bd..19fc7bf 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||