diff options
| author | BlueWall | 2012-02-18 00:51:23 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-18 00:51:23 -0500 |
| commit | 14e9bf894cb74ba0341825099ba5bd10be40d431 (patch) | |
| tree | 7062a263a519705d8274faeef8abd4f3ec79ceaa | |
| parent | Route logins according to Estate, Telehub and TeleportFlags (diff) | |
| parent | Report an error if the required native Windows ODE library can't be found. (diff) | |
| download | opensim-SC_OLD-14e9bf894cb74ba0341825099ba5bd10be40d431.zip opensim-SC_OLD-14e9bf894cb74ba0341825099ba5bd10be40d431.tar.gz opensim-SC_OLD-14e9bf894cb74ba0341825099ba5bd10be40d431.tar.bz2 opensim-SC_OLD-14e9bf894cb74ba0341825099ba5bd10be40d431.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 5 | ||||
| -rwxr-xr-x | bin/lib64/ode.dll | bin | 0 -> 656384 bytes |
2 files changed, 4 insertions, 1 deletions
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 | |||
| 75 | nativeLibraryPath = "lib32/ode.dll"; | 75 | nativeLibraryPath = "lib32/ode.dll"; |
| 76 | 76 | ||
| 77 | m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath); | 77 | m_log.DebugFormat("[ODE PLUGIN]: Loading native Windows ODE library at {0}", nativeLibraryPath); |
| 78 | Util.LoadLibrary(nativeLibraryPath); | 78 | |
| 79 | if (Util.LoadLibrary(nativeLibraryPath) == IntPtr.Zero) | ||
| 80 | m_log.ErrorFormat( | ||
| 81 | "[ODE PLUGIN]: Couldn't find native Windows ODE library at {0}", nativeLibraryPath); | ||
| 79 | } | 82 | } |
| 80 | 83 | ||
| 81 | // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to | 84 | // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to |
diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll new file mode 100755 index 0000000..df3a6c4 --- /dev/null +++ b/bin/lib64/ode.dll | |||
| Binary files differ | |||