diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 9338130..dcb2c91 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -274,7 +274,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 274 | public virtual float Density { get; set; } | 274 | public virtual float Density { get; set; } |
| 275 | public virtual float GravModifier { get; set; } | 275 | public virtual float GravModifier { get; set; } |
| 276 | public virtual float Friction { get; set; } | 276 | public virtual float Friction { get; set; } |
| 277 | public virtual float Bounce { get; set; } | 277 | public virtual float Restitution { get; set; } |
| 278 | 278 | ||
| 279 | /// <summary> | 279 | /// <summary> |
| 280 | /// Position of this actor. | 280 | /// Position of this actor. |