diff options
| author | Melanie | 2012-02-19 20:08:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-19 20:08:01 +0100 |
| commit | 96409cc2eeb4555609f72c8bc61fbdf4ac3e9933 (patch) | |
| tree | 394a7a07ff913c8efa390399c190d5c65bf8f95b /bin | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | moved vehicle from SOG to SOP (diff) | |
| download | opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.zip opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.gz opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.bz2 opensim-SC-96409cc2eeb4555609f72c8bc61fbdf4ac3e9933.tar.xz | |
Merge branch 'ubitwork'
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config | 7 | ||||
| -rw-r--r-- | bin/Physics/libode-x86_64.so | bin | 0 -> 5546089 bytes | |||
| -rw-r--r-- | bin/Physics/libode.so | bin | 0 -> 3051566 bytes |
3 files changed, 7 insertions, 0 deletions
diff --git a/bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config new file mode 100644 index 0000000..f8f071e --- /dev/null +++ b/bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | <configuration> | ||
| 2 | <dllmap os="osx" dll="ode" target="libode.dylib" /> | ||
| 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" /> | ||
| 4 | <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" /> | ||
| 5 | <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" /> | ||
| 6 | <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" /> | ||
| 7 | </configuration> \ No newline at end of file | ||
diff --git a/bin/Physics/libode-x86_64.so b/bin/Physics/libode-x86_64.so new file mode 100644 index 0000000..9c3070a --- /dev/null +++ b/bin/Physics/libode-x86_64.so | |||
| Binary files differ | |||
diff --git a/bin/Physics/libode.so b/bin/Physics/libode.so new file mode 100644 index 0000000..6bb85fb --- /dev/null +++ b/bin/Physics/libode.so | |||
| Binary files differ | |||