diff options
| author | Melanie | 2013-02-08 23:29:47 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-08 23:29:47 +0000 |
| commit | 12971e73d40d5962fb7f902d086f6c10b995b220 (patch) | |
| tree | 645bbe2aed0dad1df760fda57ad0ca7da2463b3b /OpenSim/Region/Physics/Manager | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-12971e73d40d5962fb7f902d086f6c10b995b220.zip opensim-SC_OLD-12971e73d40d5962fb7f902d086f6c10b995b220.tar.gz opensim-SC_OLD-12971e73d40d5962fb7f902d086f6c10b995b220.tar.bz2 opensim-SC_OLD-12971e73d40d5962fb7f902d086f6c10b995b220.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -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 e2789d6..7cd364b 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. |