diff options
| author | Melanie | 2013-02-06 02:22:12 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-06 02:22:12 +0000 |
| commit | f567ff9f51aebe522c210b5d34b26754de157c91 (patch) | |
| tree | eac712a0ba78ca92b3178e2d532307c4ed489b06 /OpenSim/Region/Physics/Manager | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.... (diff) | |
| download | opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.zip opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.gz opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.bz2 opensim-SC-f567ff9f51aebe522c210b5d34b26754de157c91.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/IMesher.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/IMesher.cs b/OpenSim/Region/Physics/Manager/IMesher.cs index df980ab..5485eb7 100644 --- a/OpenSim/Region/Physics/Manager/IMesher.cs +++ b/OpenSim/Region/Physics/Manager/IMesher.cs | |||
| @@ -83,6 +83,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 83 | List<Vector3> getVertexList(); | 83 | List<Vector3> getVertexList(); |
| 84 | int[] getIndexListAsInt(); | 84 | int[] getIndexListAsInt(); |
| 85 | int[] getIndexListAsIntLocked(); | 85 | int[] getIndexListAsIntLocked(); |
| 86 | float[] getVertexListAsFloat(); | ||
| 86 | float[] getVertexListAsFloatLocked(); | 87 | float[] getVertexListAsFloatLocked(); |
| 87 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); | 88 | void getIndexListAsPtrToIntArray(out IntPtr indices, out int triStride, out int indexCount); |
| 88 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); | 89 | void getVertexListAsPtrToFloatArray(out IntPtr vertexList, out int vertexStride, out int vertexCount); |