aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorUbitUmarov2012-07-09 17:01:52 +0100
committerUbitUmarov2012-07-09 17:01:52 +0100
commita7097680851528f01477903d946095abce99e504 (patch)
tree5c0244ad69a73e34496b581eba3b7c446b95a9fe /OpenSim/Region/Physics
parent log ODE lib configuration (diff)
downloadopensim-SC-a7097680851528f01477903d946095abce99e504.zip
opensim-SC-a7097680851528f01477903d946095abce99e504.tar.gz
opensim-SC-a7097680851528f01477903d946095abce99e504.tar.bz2
opensim-SC-a7097680851528f01477903d946095abce99e504.tar.xz
fix ode getconfiguration
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs2
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
index 0e4961b..34865c1 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
@@ -1312,7 +1312,7 @@ namespace OdeAPI
1312 public static extern void GeomTriMeshSetRayCallback(IntPtr g, TriRayCallback callback); 1312 public static extern void GeomTriMeshSetRayCallback(IntPtr g, TriRayCallback callback);
1313 1313
1314 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGetConfiguration"), SuppressUnmanagedCodeSecurity] 1314 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGetConfiguration"), SuppressUnmanagedCodeSecurity]
1315 public static extern string GetConfiguration(string str); 1315 public static extern string GetConfiguration();
1316 1316
1317 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity] 1317 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
1318 public static extern IntPtr HashSpaceCreate(IntPtr space); 1318 public static extern IntPtr HashSpaceCreate(IntPtr space);
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 46251de..d5938f4 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -409,7 +409,7 @@ namespace OpenSim.Region.Physics.OdePlugin
409 mesher = meshmerizer; 409 mesher = meshmerizer;
410 m_config = config; 410 m_config = config;
411 411
412 string ode_config = d.GetConfiguration("ODE"); 412 string ode_config = d.GetConfiguration();
413 if (ode_config != null && ode_config != "") 413 if (ode_config != null && ode_config != "")
414 { 414 {
415 m_log.WarnFormat("ODE configuration: {0}", ode_config); 415 m_log.WarnFormat("ODE configuration: {0}", ode_config);