Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2012-02-18 00:51:23 -05:00 · 2012-02-18 00:51:23 -05:00 · 14e9bf894c
parent f4cd35322f 9846a1e56e
commit 14e9bf894c
2 changed files with 4 additions and 1 deletions
--- 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
--- a/bin/lib64/ode.dll
+++ b/bin/lib64/ode.dll