diff options
author | UbitUmarov | 2012-07-13 23:57:45 +0100 |
---|---|---|
committer | UbitUmarov | 2012-07-13 23:57:45 +0100 |
commit | 72e2b9409462861d183ac7b391f5911defcd3bb0 (patch) | |
tree | 8e150a48fd887300750a51edb7cb213b70f89acc /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
parent | missed fix on vehicle reference frame (diff) | |
download | opensim-SC-72e2b9409462861d183ac7b391f5911defcd3bb0.zip opensim-SC-72e2b9409462861d183ac7b391f5911defcd3bb0.tar.gz opensim-SC-72e2b9409462861d183ac7b391f5911defcd3bb0.tar.bz2 opensim-SC-72e2b9409462861d183ac7b391f5911defcd3bb0.tar.xz |
In collisions report linksets root parts to parts, and not all parts.
Temporary suspend collision checks on full stopped bodies, until a better
away is found wake them, avoiding spurius collision end and start events.
Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 865180f..b506b1c 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -95,7 +95,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
95 | private bool m_iscollidingObj = false; | 95 | private bool m_iscollidingObj = false; |
96 | private bool m_alwaysRun = false; | 96 | private bool m_alwaysRun = false; |
97 | private int m_requestedUpdateFrequency = 0; | 97 | private int m_requestedUpdateFrequency = 0; |
98 | public uint m_localID = 0; | 98 | private uint m_localID = 0; |
99 | public bool m_returnCollisions = false; | 99 | public bool m_returnCollisions = false; |
100 | // taints and their non-tainted counterparts | 100 | // taints and their non-tainted counterparts |
101 | public bool m_isPhysical = false; // the current physical status | 101 | public bool m_isPhysical = false; // the current physical status |
@@ -214,6 +214,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
214 | 214 | ||
215 | public override uint LocalID | 215 | public override uint LocalID |
216 | { | 216 | { |
217 | get { return m_localID; } | ||
217 | set { m_localID = value; } | 218 | set { m_localID = value; } |
218 | } | 219 | } |
219 | 220 | ||