diff options
| author | Melanie | 2012-11-04 22:37:28 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-04 22:37:28 +0000 |
| commit | dd416298f1da71b801c789367a4408f5c2728df1 (patch) | |
| tree | 9aa8ed8419dd536fe2f326755ad3468289818ffc /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
| download | opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.zip opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.gz opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.bz2 opensim-SC-dd416298f1da71b801c789367a4408f5c2728df1.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
| -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 | } |