diff options
author | UbitUmarov | 2012-10-20 17:53:33 +0100 |
---|---|---|
committer | UbitUmarov | 2012-10-20 17:53:33 +0100 |
commit | 3b51cae958df48cd629124e875d7236038f60302 (patch) | |
tree | 2528f3e22f465d3cff2922319e1eea8eff9a9571 /OpenSim/Region | |
parent | UbitOde stop doing a copy of the asset data using just the reference to (diff) | |
download | opensim-SC_OLD-3b51cae958df48cd629124e875d7236038f60302.zip opensim-SC_OLD-3b51cae958df48cd629124e875d7236038f60302.tar.gz opensim-SC_OLD-3b51cae958df48cd629124e875d7236038f60302.tar.bz2 opensim-SC_OLD-3b51cae958df48cd629124e875d7236038f60302.tar.xz |
bug fix
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 2 |
2 files changed, 3 insertions, 1 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 | } |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index b98f177..cce8946 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -2344,7 +2344,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2344 | } | 2344 | } |
2345 | } | 2345 | } |
2346 | } | 2346 | } |
2347 | IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); | 2347 | IntPtr HeightmapData = d.GeomUbitTerrainDataCreate(); |
2348 | 2348 | ||
2349 | const int wrap = 0; | 2349 | const int wrap = 0; |
2350 | float thickness = hfmin; | 2350 | float thickness = hfmin; |