diff options
| author | Diva Canto | 2012-11-27 21:11:19 -0800 |
|---|---|---|
| committer | Diva Canto | 2012-11-27 21:11:19 -0800 |
| commit | d656ec8f33164cb9d202e655bcbc655310d3ed6e (patch) | |
| tree | c71e56c0eff25855b538be3ebe86138db2c7b271 /OpenSim/Region/Physics/OdePlugin | |
| parent | Bug fix in Offline IM for inventory transfers. The items were being placed tw... (diff) | |
| parent | Stop logging spurious asset data for {0} is zero length error for sculpts/mesh (diff) | |
| download | opensim-SC-d656ec8f33164cb9d202e655bcbc655310d3ed6e.zip opensim-SC-d656ec8f33164cb9d202e655bcbc655310d3ed6e.tar.gz opensim-SC-d656ec8f33164cb9d202e655bcbc655310d3ed6e.tar.bz2 opensim-SC-d656ec8f33164cb9d202e655bcbc655310d3ed6e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 5a0b8d1..0d66496 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -3361,6 +3361,11 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 3361 | _pbs.SculptData = new byte[asset.Data.Length]; | 3361 | _pbs.SculptData = new byte[asset.Data.Length]; |
| 3362 | asset.Data.CopyTo(_pbs.SculptData, 0); | 3362 | asset.Data.CopyTo(_pbs.SculptData, 0); |
| 3363 | // m_assetFailed = false; | 3363 | // m_assetFailed = false; |
| 3364 | |||
| 3365 | // m_log.DebugFormat( | ||
| 3366 | // "[ODE PRIM]: Received mesh/sculpt data asset {0} with {1} bytes for {2} at {3} in {4}", | ||
| 3367 | // _pbs.SculptTexture, _pbs.SculptData.Length, Name, _position, _parent_scene.Name); | ||
| 3368 | |||
| 3364 | m_taintshape = true; | 3369 | m_taintshape = true; |
| 3365 | _parent_scene.AddPhysicsActorTaint(this); | 3370 | _parent_scene.AddPhysicsActorTaint(this); |
| 3366 | } | 3371 | } |