OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-20 18:55:44 +02:00
parent a936b9b7d3 3b51cae958
commit 3212bcff59
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
View File

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

2
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

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