diff options
| author | Melanie | 2012-12-23 18:05:17 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-23 18:05:17 +0000 |
| commit | a126097d6be209ba4e30b5573195c04bcf2d8c1e (patch) | |
| tree | bce8220f560827a332155ca84e16de94677ca235 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: modify avatar motor code to make falling movement better. Clean up... (diff) | |
| download | opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.zip opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.gz opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.bz2 opensim-SC-a126097d6be209ba4e30b5573195c04bcf2d8c1e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 2017fa5..8580928 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
| @@ -56,7 +56,7 @@ public abstract class BSLinkset | |||
| 56 | { | 56 | { |
| 57 | BSLinkset ret = null; | 57 | BSLinkset ret = null; |
| 58 | 58 | ||
| 59 | switch ((int)physScene.Params.linksetImplementation) | 59 | switch ((int)BSParam.LinksetImplementation) |
| 60 | { | 60 | { |
| 61 | case (int)LinksetImplementation.Constraint: | 61 | case (int)LinksetImplementation.Constraint: |
| 62 | ret = new BSLinksetConstraints(physScene, parent); | 62 | ret = new BSLinksetConstraints(physScene, parent); |