From 0ef64fbe03a0872c9ae55d615b85fb9a24bbc820 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Feb 2012 02:46:07 +0000
Subject: Actually add the Windows 64-bit ode.dll file.

This might be why it didn't work.
---
 bin/lib64/ode.dll | Bin 0 -> 656384 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 bin/lib64/ode.dll

diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll
new file mode 100755
index 0000000..df3a6c4
Binary files /dev/null and b/bin/lib64/ode.dll differ
-- 
cgit v1.1


From 9846a1e56e28a5668d4a0a4076f02a9e359eef1a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Feb 2012 02:52:29 +0000
Subject: Report an error if the required native Windows ODE library can't be
 found.

---
 OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 6ee2714..e8bb476 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -75,7 +75,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                         nativeLibraryPath = "lib32/ode.dll";
 
                     m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath);
-                    Util.LoadLibrary(nativeLibraryPath);
+
+                    if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero)
+                        m_log.ErrorFormat(
+                            "[ODE PLUGIN]: Couldn't find native Windows ODE library at {0}", nativeLibraryPath);
                 }
 
                 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
-- 
cgit v1.1