diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index f3b0630..c736557 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -100,7 +100,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 100 | private bool m_hackSentFly = false; | 100 | private bool m_hackSentFly = false; |
| 101 | private int m_requestedUpdateFrequency = 0; | 101 | private int m_requestedUpdateFrequency = 0; |
| 102 | private Vector3 m_taintPosition; | 102 | private Vector3 m_taintPosition; |
| 103 | 103 | internal bool m_avatarplanted = false; | |
| 104 | /// <summary> | 104 | /// <summary> |
| 105 | /// Hold set forces so we can process them outside physics calculations. This prevents race conditions if we set force | 105 | /// Hold set forces so we can process them outside physics calculations. This prevents race conditions if we set force |
| 106 | /// while calculatios are going on | 106 | /// while calculatios are going on |
| @@ -413,7 +413,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 413 | set | 413 | set |
| 414 | { | 414 | { |
| 415 | m_iscollidingObj = value; | 415 | m_iscollidingObj = value; |
| 416 | if (value) | 416 | if (value && !m_avatarplanted) |
| 417 | m_pidControllerActive = false; | 417 | m_pidControllerActive = false; |
| 418 | else | 418 | else |
| 419 | m_pidControllerActive = true; | 419 | m_pidControllerActive = true; |