diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Region/Physics/UbitMeshing/Mesh.cs | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
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(); |