aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorMelanie2009-08-08 01:43:28 +0100
committerMelanie2009-08-08 01:43:28 +0100
commit0b0ed200f66bb8ab3c139d85263e7c8e81117791 (patch)
tree49af5e09fa54c4ef1d441ebd58ab9c6bf4a242fd /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
parentChange the default for internal IP address back to 0.0.0.0 (diff)
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.zip
opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.gz
opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.bz2
opensim-SC_OLD-0b0ed200f66bb8ab3c139d85263e7c8e81117791.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d8d3b68..443788c 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Physics.OdePlugin
181 _velocity = new PhysicsVector(); 181 _velocity = new PhysicsVector();
182 if (!PhysicsVector.isFinite(pos)) 182 if (!PhysicsVector.isFinite(pos))
183 { 183 {
184 pos = new PhysicsVector(128, 128, parent_scene.GetTerrainHeightAtXY(128, 128) + 0.5f); 184 pos = new PhysicsVector(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), parent_scene.GetTerrainHeightAtXY(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f)) + 0.5f);
185 m_log.Warn("[PHYSICS]: Got nonFinite Object create Position"); 185 m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
186 } 186 }
187 _position = pos; 187 _position = pos;
@@ -2538,7 +2538,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2538 l_orientation.Z = ori.Z; 2538 l_orientation.Z = ori.Z;
2539 l_orientation.W = ori.W; 2539 l_orientation.W = ori.W;
2540 2540
2541 if (l_position.X > 255.95f || l_position.X < 0f || l_position.Y > 255.95f || l_position.Y < 0f) 2541 if (l_position.X > ((int)Constants.RegionSize - 0.05f) || l_position.X < 0f || l_position.Y > ((int)Constants.RegionSize - 0.05f) || l_position.Y < 0f)
2542 { 2542 {
2543 //base.RaiseOutOfBounds(l_position); 2543 //base.RaiseOutOfBounds(l_position);
2544 2544