aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorMelanie2010-06-12 16:25:40 +0100
committerMelanie2010-06-12 16:25:40 +0100
commitceac35bac1c5ec5f7a39e66492bcef1968e27931 (patch)
tree611e2db11a190af98b652c1d0e7d43b2c54573e7 /OpenSim/Region/Physics
parentPreserving the link numbers is a serializer's highest duty. (diff)
downloadopensim-SC_OLD-ceac35bac1c5ec5f7a39e66492bcef1968e27931.zip
opensim-SC_OLD-ceac35bac1c5ec5f7a39e66492bcef1968e27931.tar.gz
opensim-SC_OLD-ceac35bac1c5ec5f7a39e66492bcef1968e27931.tar.bz2
opensim-SC_OLD-ceac35bac1c5ec5f7a39e66492bcef1968e27931.tar.xz
Log and eat sculpt meshing exceptions caused by bad jp2 data.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs13
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