diff options
| author | John Hurliman | 2009-10-19 15:19:37 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
| commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
| tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Region/Physics/Manager/IMesher.cs | |
| parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
| parent | Minor formatting cleanup. (diff) | |
| download | opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC_OLD-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to 'OpenSim/Region/Physics/Manager/IMesher.cs')
| -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); |