Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-11-17 02:58:14 +00:00
13 changed files with 261 additions and 49 deletions

View File

@@ -1403,8 +1403,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if (vertexCount == 0 || indexCount == 0)
{
m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0}, mesh {1}",
Name, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh");
m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0}, mesh {1} at {2}",
Name, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh",_position.ToString());
m_hasOBB = false;
m_OBBOffset = Vector3.Zero;