diff options
| author | Melanie | 2012-11-01 22:25:29 +0100 |
|---|---|---|
| committer | Melanie | 2012-11-01 22:25:29 +0100 |
| commit | cbe43c15ec9ef355a1e9751650b9588e186eb7b2 (patch) | |
| tree | f3e295704881db126b211a8ea488e29d86fb640f /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
| parent | Add AnimState to CADU (diff) | |
| parent | revert last change (diff) | |
| download | opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.zip opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.tar.gz opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.tar.bz2 opensim-SC-cbe43c15ec9ef355a1e9751650b9588e186eb7b2.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index ce67cc4..76e42d4 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
| @@ -1108,6 +1108,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1108 | ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype); | 1108 | ODEPhysRepData repData = _parent_scene.m_meshWorker.NewActorPhysRep(this, _pbs, _size, m_shapetype); |
| 1109 | 1109 | ||
| 1110 | primVolume = repData.volume; | 1110 | primVolume = repData.volume; |
| 1111 | m_OBB = repData.OBB; | ||
| 1112 | m_OBBOffset = repData.OBBOffset; | ||
| 1111 | 1113 | ||
| 1112 | UpdatePrimBodyData(); | 1114 | UpdatePrimBodyData(); |
| 1113 | } | 1115 | } |