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/OdePlugin/ODEPrim.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/OdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 496e097..63bfc90 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -816,8 +816,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 816 | IntPtr vertices, indices; | 816 | IntPtr vertices, indices; |
| 817 | int vertexCount, indexCount; | 817 | int vertexCount, indexCount; |
| 818 | int vertexStride, triStride; | 818 | int vertexStride, triStride; |
| 819 | mesh.getVertexListAsPtrToFloatArray( out vertices, out vertexStride, out vertexCount ); // Note, that vertices are fixed in unmanaged heap | 819 | mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap |
| 820 | mesh.getIndexListAsPtrToIntArray( out indices, out triStride, out indexCount ); // Also fixed, needs release after usage | 820 | mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage |
| 821 | 821 | ||
| 822 | mesh.releaseSourceMeshData(); // free up the original mesh data to save memory | 822 | mesh.releaseSourceMeshData(); // free up the original mesh data to save memory |
| 823 | 823 | ||