aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin
diff options
context:
space:
mode:
authorUbitUmarov2012-07-09 17:21:54 +0100
committerUbitUmarov2012-07-09 17:21:54 +0100
commit3a1d46ad446cb4d5d0f193bd9d7cdcfc4f65a565 (patch)
treef5aeb2e34386556e505db3b9fab0124f617dbc0b /OpenSim/Region/Physics/UbitOdePlugin
parent fix ode getconfiguration (diff)
downloadopensim-SC_OLD-3a1d46ad446cb4d5d0f193bd9d7cdcfc4f65a565.zip
opensim-SC_OLD-3a1d46ad446cb4d5d0f193bd9d7cdcfc4f65a565.tar.gz
opensim-SC_OLD-3a1d46ad446cb4d5d0f193bd9d7cdcfc4f65a565.tar.bz2
opensim-SC_OLD-3a1d46ad446cb4d5d0f193bd9d7cdcfc4f65a565.tar.xz
retry fixing ode getconfiguration()
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
index 34865c1..2341186 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs
@@ -1312,7 +1312,14 @@ 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(); 1315 public static extern IntPtr iGetConfiguration();
1316
1317 public static string GetConfiguration()
1318 {
1319 IntPtr ptr = iGetConfiguration();
1320 string s = Marshal.PtrToStringAnsi(ptr);
1321 return s;
1322 }
1316 1323
1317 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity] 1324 [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dHashSpaceCreate"), SuppressUnmanagedCodeSecurity]
1318 public static extern IntPtr HashSpaceCreate(IntPtr space); 1325 public static extern IntPtr HashSpaceCreate(IntPtr space);