diff options
author | Teravus Ovares | 2008-05-25 11:22:05 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-25 11:22:05 +0000 |
commit | 042c9ed4d82e4389ec929f5438e82defad251235 (patch) | |
tree | 002d741e83cec0ee1a715603af7af5aacb5d079a /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | * phantom sculpties don't request the sculpt texture anymore. (diff) | |
download | opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.zip opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.tar.gz opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.tar.bz2 opensim-SC_OLD-042c9ed4d82e4389ec929f5438e82defad251235.tar.xz |
* Adds Top Colliders when using ODE. Access it from the estate tools/debug tab.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 4c8eb20..6ade638 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
124 | private bool m_throttleUpdates = false; | 124 | private bool m_throttleUpdates = false; |
125 | private int throttleCounter = 0; | 125 | private int throttleCounter = 0; |
126 | public int m_interpenetrationcount = 0; | 126 | public int m_interpenetrationcount = 0; |
127 | public int m_collisionscore = 0; | 127 | public float m_collisionscore = 0; |
128 | public int m_roundsUnderMotionThreshold = 0; | 128 | public int m_roundsUnderMotionThreshold = 0; |
129 | private int m_crossingfailures = 0; | 129 | private int m_crossingfailures = 0; |
130 | 130 | ||
@@ -243,7 +243,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
243 | // is physical or the object is modified somehow *IN THE FUTURE* | 243 | // is physical or the object is modified somehow *IN THE FUTURE* |
244 | // without this, if an avatar selects prim, they can walk right | 244 | // without this, if an avatar selects prim, they can walk right |
245 | // through it while it's selected | 245 | // through it while it's selected |
246 | 246 | m_collisionscore = 0; | |
247 | if ((m_isphysical && !_zeroFlag) || !value) | 247 | if ((m_isphysical && !_zeroFlag) || !value) |
248 | { | 248 | { |
249 | m_taintselected = value; | 249 | m_taintselected = value; |
@@ -1783,6 +1783,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1783 | public override float CollisionScore | 1783 | public override float CollisionScore |
1784 | { | 1784 | { |
1785 | get { return m_collisionscore; } | 1785 | get { return m_collisionscore; } |
1786 | set { m_collisionscore = value; } | ||
1786 | } | 1787 | } |
1787 | 1788 | ||
1788 | public override bool Kinematic | 1789 | public override bool Kinematic |