diff options
| author | Melanie | 2010-06-12 16:27:37 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-12 16:27:37 +0100 |
| commit | d2342319da2b1f426ab2fe8bc3c83c9b5a6ed1e3 (patch) | |
| tree | df2ffe31c0b0a3f5d6de69237f26ded02af5aeeb /OpenSim/Region/Physics | |
| parent | Preserving the link numbers is a serializer's highest duty. (diff) | |
| parent | Log and eat sculpt meshing exceptions caused by bad jp2 data. (diff) | |
| download | opensim-SC_OLD-d2342319da2b1f426ab2fe8bc3c83c9b5a6ed1e3.zip opensim-SC_OLD-d2342319da2b1f426ab2fe8bc3c83c9b5a6ed1e3.tar.gz opensim-SC_OLD-d2342319da2b1f426ab2fe8bc3c83c9b5a6ed1e3.tar.bz2 opensim-SC_OLD-d2342319da2b1f426ab2fe8bc3c83c9b5a6ed1e3.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 7984bd9..a9e9f5c 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1771,7 +1771,18 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1771 | IMesh mesh = null; | 1771 | IMesh mesh = null; |
| 1772 | 1772 | ||
| 1773 | if (needsMeshing(pbs)) | 1773 | if (needsMeshing(pbs)) |
| 1774 | mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); | 1774 | { |
| 1775 | try | ||
| 1776 | { | ||
| 1777 | mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); | ||
| 1778 | } | ||
| 1779 | catch(Exception e) | ||
| 1780 | { | ||
| 1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}."); | ||
| 1782 | m_log.Debug(e.ToString()); | ||
| 1783 | mesh = null; | ||
| 1784 | } | ||
| 1785 | } | ||
| 1775 | 1786 | ||
| 1776 | result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); | 1787 | result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); |
| 1777 | 1788 | ||