diff options
| author | Melanie | 2009-10-05 12:58:52 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-05 12:58:52 +0100 |
| commit | 8d5a40aad03cb0f46aa90a90e3e8d9464041faf7 (patch) | |
| tree | 05e5908228936457563e031bbaa1d4a65b9c2544 /OpenSim/Region/Physics/Manager | |
| parent | Fix build break (diff) | |
| parent | Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocat... (diff) | |
| download | opensim-SC_OLD-8d5a40aad03cb0f46aa90a90e3e8d9464041faf7.zip opensim-SC_OLD-8d5a40aad03cb0f46aa90a90e3e8d9464041faf7.tar.gz opensim-SC_OLD-8d5a40aad03cb0f46aa90a90e3e8d9464041faf7.tar.bz2 opensim-SC_OLD-8d5a40aad03cb0f46aa90a90e3e8d9464041faf7.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, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index e26c623..ac14292 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
| @@ -47,6 +47,8 @@ namespace OpenSim.Region.Physics.Manager | |||
| 47 | int[] getIndexListAsInt(); | 47 | int[] getIndexListAsInt(); |
| 48 | int[] getIndexListAsIntLocked(); | 48 | int[] getIndexListAsIntLocked(); |
| 49 | float[] getVertexListAsFloatLocked(); | 49 | float[] getVertexListAsFloatLocked(); |
| 50 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); | ||
| 51 | void getVertexListAsPtrToFloatArray( out IntPtr vertexList, out int vertexStride, out int vertexCount ); | ||
| 50 | void releaseSourceMeshData(); | 52 | void releaseSourceMeshData(); |
| 51 | void releasePinned(); | 53 | void releasePinned(); |
| 52 | void Append(IMesh newMesh); | 54 | void Append(IMesh newMesh); |