diff options
| author | Melanie | 2012-09-28 00:15:58 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-28 00:15:58 +0200 |
| commit | f05ca1a0fecee157daa8072ffda7e372cfaf81d8 (patch) | |
| tree | e49fdbc0ecfe7ca83f549d82d6ce4434ddafea26 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | Fix a possible NRE (diff) | |
| parent | make some forgotten changes be done by simulation thread not by caller (diff) | |
| download | opensim-SC-f05ca1a0fecee157daa8072ffda7e372cfaf81d8.zip opensim-SC-f05ca1a0fecee157daa8072ffda7e372cfaf81d8.tar.gz opensim-SC-f05ca1a0fecee157daa8072ffda7e372cfaf81d8.tar.bz2 opensim-SC-f05ca1a0fecee157daa8072ffda7e372cfaf81d8.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 3ee5198..f126644 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -134,6 +134,17 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 134 | AddAngForce, | 134 | AddAngForce, |
| 135 | AngLock, | 135 | AngLock, |
| 136 | 136 | ||
| 137 | Buoyancy, | ||
| 138 | |||
| 139 | PIDTarget, | ||
| 140 | PIDTau, | ||
| 141 | PIDActive, | ||
| 142 | |||
| 143 | PIDHoverHeight, | ||
| 144 | PIDHoverType, | ||
| 145 | PIDHoverTau, | ||
| 146 | PIDHoverActive, | ||
| 147 | |||
| 137 | Size, | 148 | Size, |
| 138 | Shape, | 149 | Shape, |
| 139 | 150 | ||