diff options
| author | Melanie | 2012-04-25 19:15:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 19:15:40 +0100 |
| commit | db31c9fe58f381fda7ddbee79fa467713b7c9bc6 (patch) | |
| tree | 716ea72a563fd837dc39ef28d07bea272764277b /OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | set PIDHoverTau and not PIDTau since all physics need that (diff) | |
| download | opensim-SC-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.zip opensim-SC-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.tar.gz opensim-SC-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.tar.bz2 opensim-SC-db31c9fe58f381fda7ddbee79fa467713b7c9bc6.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 6ffcb9e..8b5b989 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -346,12 +346,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 346 | m_iscollidingObj = true; | 346 | m_iscollidingObj = true; |
| 347 | 347 | ||
| 348 | // m_iscollidingObj = value; | 348 | // m_iscollidingObj = value; |
| 349 | /* | 349 | |
| 350 | if (m_iscollidingObj) | 350 | if (m_iscollidingObj) |
| 351 | m_pidControllerActive = false; | 351 | m_pidControllerActive = false; |
| 352 | else | 352 | else |
| 353 | m_pidControllerActive = true; | 353 | m_pidControllerActive = true; |
| 354 | */ | ||
| 355 | } | 354 | } |
| 356 | } | 355 | } |
| 357 | 356 | ||