aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-06-19 09:25:36 -0700
committerDiva Canto2010-06-19 09:25:36 -0700
commit9b410f5e94b2969fbd1004560eae567d1c950666 (patch)
treecbb5ad6e31888ddab82f99a363795ce01a794e1d
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-9b410f5e94b2969fbd1004560eae567d1c950666.zip
opensim-SC_OLD-9b410f5e94b2969fbd1004560eae567d1c950666.tar.gz
opensim-SC_OLD-9b410f5e94b2969fbd1004560eae567d1c950666.tar.bz2
opensim-SC_OLD-9b410f5e94b2969fbd1004560eae567d1c950666.tar.xz
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777.
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f84c505..100f98d 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1772,7 +1772,16 @@ namespace OpenSim.Region.Physics.OdePlugin
1772 1772
1773 if (needsMeshing(pbs)) 1773 if (needsMeshing(pbs))
1774 { 1774 {
1775 mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); 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}.", primName);
1782 m_log.Debug(e.ToString());
1783 mesh = null;
1784 }
1776 } 1785 }
1777 1786
1778 result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); 1787 result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);