diff options
| author | Melanie | 2012-07-17 10:25:13 +0200 |
|---|---|---|
| committer | Melanie | 2012-07-17 10:25:13 +0200 |
| commit | 0797736fba7f87f7d9bd9d514bb318e1c7844124 (patch) | |
| tree | de4ba57287560a22d7c2d03a37ad561a965f5637 /OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs | |
| parent | Replace PollServiceRequestManager with older version, add extra logging to (diff) | |
| parent | fix PollServiceRequestManager (diff) | |
| download | opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.zip opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.tar.gz opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.tar.bz2 opensim-SC_OLD-0797736fba7f87f7d9bd9d514bb318e1c7844124.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs index ee48db5..403a4ce 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeApi.cs | |||
| @@ -903,7 +903,7 @@ namespace OdeAPI | |||
| 903 | public static extern GeomClassID GeomGetClass(IntPtr geom); | 903 | public static extern GeomClassID GeomGetClass(IntPtr geom); |
| 904 | 904 | ||
| 905 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity] | 905 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetData"), SuppressUnmanagedCodeSecurity] |
| 906 | public static extern IntPtr GeomGetData(IntPtr geom); | 906 | public static extern IntPtr GeomGetData(IntPtr geom); |
| 907 | 907 | ||
| 908 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity] | 908 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomGetOffsetPosition"), SuppressUnmanagedCodeSecurity] |
| 909 | public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom); | 909 | public extern unsafe static Vector3* GeomGetOffsetPositionUnsafe(IntPtr geom); |
| @@ -1096,8 +1096,8 @@ namespace OdeAPI | |||
| 1096 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity] | 1096 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetConvex"), SuppressUnmanagedCodeSecurity] |
| 1097 | public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons); | 1097 | public static extern IntPtr GeomSetConvex(IntPtr geom, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons); |
| 1098 | 1098 | ||
| 1099 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetData"), SuppressUnmanagedCodeSecurity] | 1099 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetData"), SuppressUnmanagedCodeSecurity] |
| 1100 | public static extern void GeomSetData(IntPtr geom, IntPtr data); | 1100 | public static extern void GeomSetData(IntPtr geom, IntPtr data); |
| 1101 | 1101 | ||
| 1102 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity] | 1102 | [DllImport("ode", CallingConvention = CallingConvention.Cdecl, EntryPoint = "dGeomSetOffsetPosition"), SuppressUnmanagedCodeSecurity] |
| 1103 | public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z); | 1103 | public static extern void GeomSetOffsetPosition(IntPtr geom, dReal x, dReal y, dReal z); |