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/UbitMeshing | |
| 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/UbitMeshing/Mesh.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitMeshing/Mesh.cs b/OpenSim/Region/Physics/UbitMeshing/Mesh.cs index b67422f..fa06926 100644 --- a/OpenSim/Region/Physics/UbitMeshing/Mesh.cs +++ b/OpenSim/Region/Physics/UbitMeshing/Mesh.cs | |||
| @@ -301,7 +301,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
| 301 | return result; | 301 | return result; |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | private float[] getVertexListAsFloat() | 304 | public float[] getVertexListAsFloat() |
| 305 | { | 305 | { |
| 306 | if (m_bdata.m_vertices == null) | 306 | if (m_bdata.m_vertices == null) |
| 307 | throw new NotSupportedException(); | 307 | throw new NotSupportedException(); |