aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-12-07 00:53:47 +0000
committerJustin Clark-Casey (justincc)2012-12-07 00:53:47 +0000
commit4e622f6816b8ecc2d3ccba8ce69a2a65e2dc909b (patch)
tree1b6caf8b4ea59add539d889252953a0748675cc9 /bin
parentUse a thread abort safe version of OpenMetaverse.DoubleDictionary with the ai... (diff)
parentBulletSim: update DLLs and SOs with vehicle collision event check (diff)
downloadopensim-SC_OLD-4e622f6816b8ecc2d3ccba8ce69a2a65e2dc909b.zip
opensim-SC_OLD-4e622f6816b8ecc2d3ccba8ce69a2a65e2dc909b.tar.gz
opensim-SC_OLD-4e622f6816b8ecc2d3ccba8ce69a2a65e2dc909b.tar.bz2
opensim-SC_OLD-4e622f6816b8ecc2d3ccba8ce69a2a65e2dc909b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenMetaverse.dll.config2
-rwxr-xr-xbin/lib32/BulletSim.dllbin551936 -> 552960 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1708731 -> 1720874 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin700928 -> 702464 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1846064 -> 1859487 bytes
5 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index b67da5f..f5423b2 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,5 +1,5 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
5</configuration> 5</configuration>
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 75d5bc3..9834faa 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 b648da1..3c8e034 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 fc0fdca..75999f0 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 a1b099c..a8a4720 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ