aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2010-06-12 11:11:48 -0700
committerDiva Canto2010-06-12 11:11:48 -0700
commitb9c01a1c42fae836357f8b38cb8ceba432bfa3a8 (patch)
tree029123c679f32d0fb32223b08e3e3aca88d9d80a /OpenSim/Region
parent* Added CHANGED_TELEPORT event trigger upon inter-sim teleports. (diff)
parentLog and eat sculpt meshing exceptions caused by bad jp2 data. (diff)
downloadopensim-SC_OLD-b9c01a1c42fae836357f8b38cb8ceba432bfa3a8.zip
opensim-SC_OLD-b9c01a1c42fae836357f8b38cb8ceba432bfa3a8.tar.gz
opensim-SC_OLD-b9c01a1c42fae836357f8b38cb8ceba432bfa3a8.tar.bz2
opensim-SC_OLD-b9c01a1c42fae836357f8b38cb8ceba432bfa3a8.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-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