avinationmerge
UbitUmarov 2012-10-20 17:53:33 +01:00
parent b51c26ab40
commit 3b51cae958
2 changed files with 3 additions and 1 deletions

View File

@ -1108,6 +1108,8 @@ namespace OpenSim.Region.Physics.OdePlugin
ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype); ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype);
primVolume = repData.volume; primVolume = repData.volume;
m_OBB = repData.OBB;
m_OBBOffset = repData.OBBOffset;
UpdatePrimBodyData(); UpdatePrimBodyData();
} }

View File

@ -2344,7 +2344,7 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
} }
IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); IntPtr HeightmapData = d.GeomUbitTerrainDataCreate();
const int wrap = 0; const int wrap = 0;
float thickness = hfmin; float thickness = hfmin;