diff options
| author | Tom Grimshaw | 2010-06-20 14:45:36 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-20 14:45:36 -0700 |
| commit | 33d05ef554c4cbbdfa8c744a0ac2c23a0683ad08 (patch) | |
| tree | fb2c737c93f61f686ee5eaef0b10eb615e1f7a6f /OpenSim/Region/Physics | |
| parent | Update all clients sitting on a linkset if a child prim is moved. This preven... (diff) | |
| parent | Modify avatar responsiveness policy to send roots before children (diff) | |
| download | opensim-SC-33d05ef554c4cbbdfa8c744a0ac2c23a0683ad08.zip opensim-SC-33d05ef554c4cbbdfa8c744a0ac2c23a0683ad08.tar.gz opensim-SC-33d05ef554c4cbbdfa8c744a0ac2c23a0683ad08.tar.bz2 opensim-SC-33d05ef554c4cbbdfa8c744a0ac2c23a0683ad08.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 100f98d..7fd59a0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1781,6 +1781,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); | 1781 | m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName); |
| 1782 | m_log.Debug(e.ToString()); | 1782 | m_log.Debug(e.ToString()); |
| 1783 | mesh = null; | 1783 | mesh = null; |
| 1784 | return null; | ||
| 1784 | } | 1785 | } |
| 1785 | } | 1786 | } |
| 1786 | 1787 | ||