diff options
| author | Melanie | 2012-11-17 02:58:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-17 02:58:14 +0000 |
| commit | 7ad082f7c39ba82adeae3c25ca0befcf983c879d (patch) | |
| tree | 0e3c488c65ef22b53e4536dd07f46c1467b58f78 /OpenSim/Region/Physics | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent a buffer overflow in asset receiving (diff) | |
| download | opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.zip opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.gz opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.bz2 opensim-SC_OLD-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 76e42d4..dc247a9 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
| @@ -1403,8 +1403,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1403 | 1403 | ||
| 1404 | if (vertexCount == 0 || indexCount == 0) | 1404 | if (vertexCount == 0 || indexCount == 0) |
| 1405 | { | 1405 | { |
| 1406 | m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0}, mesh {1}", | 1406 | m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0}, mesh {1} at {2}", |
| 1407 | Name, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh"); | 1407 | Name, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh",_position.ToString()); |
| 1408 | 1408 | ||
| 1409 | m_hasOBB = false; | 1409 | m_hasOBB = false; |
| 1410 | m_OBBOffset = Vector3.Zero; | 1410 | m_OBBOffset = Vector3.Zero; |