diff options
| author | Diva Canto | 2012-09-15 19:35:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-15 19:35:33 -0700 |
| commit | daa4745fb785d30de256f04c763bfd6478ea2238 (patch) | |
| tree | a68b49adb21eb5902f0e3a9687878e6c6db5e014 /bin | |
| parent | More on HG2.0: added the possibility of controlling the appearance that avies... (diff) | |
| parent | BulletSim: update DLLs and SOs and remove some debugging code. (diff) | |
| download | opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.zip opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.tar.gz opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.tar.bz2 opensim-SC_OLD-daa4745fb785d30de256f04c763bfd6478ea2238.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/FlotsamCache.ini.example | 7 | ||||
| -rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 567296 -> 569856 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 2503027 -> 2510105 bytes | |||
| -rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 727552 -> 731136 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 2742386 -> 2750288 bytes |
5 files changed, 0 insertions, 7 deletions
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example index b9c6d84..ad74fc1 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/bin/config-include/FlotsamCache.ini.example | |||
| @@ -54,10 +54,3 @@ | |||
| 54 | 54 | ||
| 55 | ; Warning level for cache directory size | 55 | ; Warning level for cache directory size |
| 56 | ;CacheWarnAt = 30000 | 56 | ;CacheWarnAt = 30000 |
| 57 | |||
| 58 | ; Perform a deep scan of all assets within all regions, looking for all assets | ||
| 59 | ; present or referenced. Mark all assets found that are already present in the | ||
| 60 | ; cache, and request all assets that are found that are not already cached (this | ||
| 61 | ; will cause those assets to be cached) | ||
| 62 | ; | ||
| 63 | DeepScanBeforePurge = true | ||
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 0dd508c..3b35a98 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 747df24..65eba37 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 877ad4c..f01655b 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 a55e633..5302e29 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
| Binary files differ | |||