diff options
| author | Melanie | 2009-10-19 21:58:51 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-19 21:58:51 +0100 |
| commit | ffd59868f5e2d797160b1bbfc13f3b4bac717b36 (patch) | |
| tree | fb807a129a6e449ac17dadce15d7b27268c92c3f /OpenSim/Region/Physics/Manager | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.zip opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.gz opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.bz2 opensim-SC-ffd59868f5e2d797160b1bbfc13f3b4bac717b36.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index ac14292..1a8c948 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
| @@ -48,7 +48,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 48 | int[] getIndexListAsIntLocked(); | 48 | int[] getIndexListAsIntLocked(); |
| 49 | float[] getVertexListAsFloatLocked(); | 49 | float[] getVertexListAsFloatLocked(); |
| 50 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); | 50 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); |
| 51 | void getVertexListAsPtrToFloatArray( out IntPtr vertexList, out int vertexStride, out int vertexCount ); | 51 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); |
| 52 | void releaseSourceMeshData(); | 52 | void releaseSourceMeshData(); |
| 53 | void releasePinned(); | 53 | void releasePinned(); |
| 54 | void Append(IMesh newMesh); | 54 | void Append(IMesh newMesh); |