Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-18 20:49:21 +01:00
6 changed files with 130 additions and 85 deletions

View File

@@ -1778,7 +1778,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
catch(Exception e)
{
m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.");
m_log.ErrorFormat("[PHYSICS]: Exception while meshing prim {0}.", primName);
m_log.Debug(e.ToString());
mesh = null;
}