diff options
| author | Diva Canto | 2010-06-19 08:51:07 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-19 08:57:58 -0700 |
| commit | f0f684161eaf7481076cff63e794e01f654d627c (patch) | |
| tree | 288e3bd340c16fe38feb19f385b475006ad154b2 /OpenSim/Region/Physics | |
| parent | remove link to wiki mysql-config since the page was out-of-date and actively ... (diff) | |
| download | opensim-SC-f0f684161eaf7481076cff63e794e01f654d627c.zip opensim-SC-f0f684161eaf7481076cff63e794e01f654d627c.tar.gz opensim-SC-f0f684161eaf7481076cff63e794e01f654d627c.tar.bz2 opensim-SC-f0f684161eaf7481076cff63e794e01f654d627c.tar.xz | |
Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 100f98d..f84c505 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1772,16 +1772,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1772 | 1772 | ||
| 1773 | if (needsMeshing(pbs)) | 1773 | if (needsMeshing(pbs)) |
| 1774 | { | 1774 | { |
| 1775 | try | 1775 | mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical); |
| 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 | } | ||
| 1785 | } | 1776 | } |
| 1786 | 1777 | ||
| 1787 | result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); | 1778 | result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical); |