aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-09 20:29:59 +0000
committerTeravus Ovares2008-03-09 20:29:59 +0000
commit8bba8e232c98324a9462adf091af1877c5970fa2 (patch)
tree2aceca0f7a676c8a153be9d37c949bd6e935196b /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
parent* Fix for hydraulic erosion brush. Still not working as planned, but getting ... (diff)
downloadopensim-SC_OLD-8bba8e232c98324a9462adf091af1877c5970fa2.zip
opensim-SC_OLD-8bba8e232c98324a9462adf091af1877c5970fa2.tar.gz
opensim-SC_OLD-8bba8e232c98324a9462adf091af1877c5970fa2.tar.bz2
opensim-SC_OLD-8bba8e232c98324a9462adf091af1877c5970fa2.tar.xz
* Fixed a few things and enabling Physical Prim border crossings again.
* Everyone try to push a physical prim across a region border now.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 179160f..c5ffe98 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1721,16 +1721,20 @@ namespace OpenSim.Region.Physics.OdePlugin
1721 1721
1722 if (l_position.X > 255.95f || l_position.X < 0f || l_position.Y > 255.95f || l_position.Y < 0f) 1722 if (l_position.X > 255.95f || l_position.X < 0f || l_position.Y > 255.95f || l_position.Y < 0f)
1723 { 1723 {
1724 base.RaiseOutOfBounds(_position); 1724 //base.RaiseOutOfBounds(l_position);
1725 1725
1726 //if (m_crossingfailures < 5) 1726 if (m_crossingfailures < 5)
1727 //{ 1727 {
1728 //base.RequestPhysicsterseUpdate(); 1728 _position = l_position;
1729 //} 1729 //_parent_scene.remActivePrim(this);
1730 //else 1730 base.RequestPhysicsterseUpdate();
1731 //{ 1731 return;
1732 //base.RaiseOutOfBounds(_position); 1732 }
1733 //} 1733 else
1734 {
1735 base.RaiseOutOfBounds(l_position);
1736 return;
1737 }
1734 } 1738 }
1735 1739
1736 if (l_position.Z < 0) 1740 if (l_position.Z < 0)