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/Meshing | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.... (diff) | |
| download | opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.zip opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.tar.gz opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.tar.bz2 opensim-SC_OLD-f567ff9f51aebe522c210b5d34b26754de157c91.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/Physics/Meshing')
| -rw-r--r-- | OpenSim/Region/Physics/Meshing/Mesh.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs index 6970553..e6b32e7 100644 --- a/OpenSim/Region/Physics/Meshing/Mesh.cs +++ b/OpenSim/Region/Physics/Meshing/Mesh.cs | |||
| @@ -226,7 +226,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 226 | return result; | 226 | return result; |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | private float[] getVertexListAsFloat() | 229 | public float[] getVertexListAsFloat() |
| 230 | { | 230 | { |
| 231 | if (m_vertices == null) | 231 | if (m_vertices == null) |
| 232 | throw new NotSupportedException(); | 232 | throw new NotSupportedException(); |