Merge branch 'master' into careminster-presence-refactor

2026-08-10 19:36:07 +08:00 · 2010-06-19 20:32:01 +01:00
parent 49d7d8534c 24a68e36fb
commit 04b60aa490
7 changed files with 55 additions and 30 deletions
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1781,6 +1781,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                    m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName);
                    m_log.Debug(e.ToString());
                    mesh = null;
+                    return null;
                }
            }