diff options
| author | UbitUmarov | 2012-03-05 12:37:21 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-05 12:37:21 +0000 |
| commit | 7377e633c73f7ee34240cb70f0f75fcd9b705168 (patch) | |
| tree | d4f5e96224e6774da36525b5401a7ea3bb3961df /OpenSim/Region/Physics/Manager | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| download | opensim-SC_OLD-7377e633c73f7ee34240cb70f0f75fcd9b705168.zip opensim-SC_OLD-7377e633c73f7ee34240cb70f0f75fcd9b705168.tar.gz opensim-SC_OLD-7377e633c73f7ee34240cb70f0f75fcd9b705168.tar.bz2 opensim-SC_OLD-7377e633c73f7ee34240cb70f0f75fcd9b705168.tar.xz | |
update ubitOde
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 25aa4dc..1a0c2a7 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -72,11 +72,13 @@ namespace OpenSim.Region.Physics.Manager | |||
| 72 | { | 72 | { |
| 73 | public float mu; | 73 | public float mu; |
| 74 | public float bounce; | 74 | public float bounce; |
| 75 | public bool softcolide; | ||
| 75 | 76 | ||
| 76 | public ContactData(float _mu, float _bounce) | 77 | public ContactData(float _mu, float _bounce, bool _softcolide) |
| 77 | { | 78 | { |
| 78 | mu = _mu; | 79 | mu = _mu; |
| 79 | bounce = _bounce; | 80 | bounce = _bounce; |
| 81 | softcolide = _softcolide; | ||
| 80 | } | 82 | } |
| 81 | } | 83 | } |
| 82 | /// <summary> | 84 | /// <summary> |