aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorKitto Flora2009-12-24 19:19:44 -0500
committerKitto Flora2009-12-24 19:19:44 -0500
commite7439efc74a1cc0daedc51eb25ae66cd03db70b5 (patch)
tree47dcf22626bca7662575e3ab6c6680d41b812172 /OpenSim/Region/Physics
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-e7439efc74a1cc0daedc51eb25ae66cd03db70b5.zip
opensim-SC_OLD-e7439efc74a1cc0daedc51eb25ae66cd03db70b5.tar.gz
opensim-SC_OLD-e7439efc74a1cc0daedc51eb25ae66cd03db70b5.tar.bz2
opensim-SC_OLD-e7439efc74a1cc0daedc51eb25ae66cd03db70b5.tar.xz
Recover out-of-region objects during db load.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 983431d..0179240 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -215,6 +215,7 @@ namespace OpenSim.Region.Physics.OdePlugin
215 parent_scene.GetTerrainHeightAtXY(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f)) + 0.5f); 215 parent_scene.GetTerrainHeightAtXY(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f)) + 0.5f);
216 m_log.Warn("[PHYSICS]: Got nonFinite Object create Position"); 216 m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
217 } 217 }
218
218 _position = pos; 219 _position = pos;
219 m_taintposition = pos; 220 m_taintposition = pos;
220 PID_D = parent_scene.bodyPIDD; 221 PID_D = parent_scene.bodyPIDD;
@@ -254,7 +255,8 @@ namespace OpenSim.Region.Physics.OdePlugin
254 _parent_scene = parent_scene; 255 _parent_scene = parent_scene;
255 m_targetSpace = (IntPtr)0; 256 m_targetSpace = (IntPtr)0;
256 257
257 if (pos.Z < 0) 258// if (pos.Z < 0)
259 if (pos.Z < parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y))
258 m_isphysical = false; 260 m_isphysical = false;
259 else 261 else
260 { 262 {