diff options
| author | Melanie | 2012-12-28 08:32:34 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-28 08:32:34 +0000 |
| commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
| tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
| download | opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs index 20c0939..5e93a03 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSParam.cs | |||
| @@ -351,7 +351,7 @@ public static class BSParam | |||
| 351 | (s) => { return AvatarStandingFriction; }, | 351 | (s) => { return AvatarStandingFriction; }, |
| 352 | (s,p,l,v) => { AvatarStandingFriction = v; } ), | 352 | (s,p,l,v) => { AvatarStandingFriction = v; } ), |
| 353 | new ParameterDefn("AvatarDensity", "Density of an avatar. Changed on avatar recreation.", | 353 | new ParameterDefn("AvatarDensity", "Density of an avatar. Changed on avatar recreation.", |
| 354 | 60f, | 354 | 3.5f, |
| 355 | (s,cf,p,v) => { AvatarDensity = cf.GetFloat(p, v); }, | 355 | (s,cf,p,v) => { AvatarDensity = cf.GetFloat(p, v); }, |
| 356 | (s) => { return AvatarDensity; }, | 356 | (s) => { return AvatarDensity; }, |
| 357 | (s,p,l,v) => { s.UpdateParameterObject((x)=>{AvatarDensity=x;}, p, l, v); } ), | 357 | (s,p,l,v) => { s.UpdateParameterObject((x)=>{AvatarDensity=x;}, p, l, v); } ), |