diff options
| author | Justin Clark-Casey (justincc) | 2012-12-13 01:12:12 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-12-13 01:12:12 +0000 |
| commit | 8e8da20af2bf011098ebf68aae80d92da56dae65 (patch) | |
| tree | ff368505aa31f0df0fe83d9990ad3c08abb5e02e /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Fix sounds so that they play from inventory after teleport rather than only o... (diff) | |
| parent | BulletSim: fix problem of avatar's floating off the ground after unsitting. R... (diff) | |
| download | opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.zip opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.tar.gz opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.tar.bz2 opensim-SC_OLD-8e8da20af2bf011098ebf68aae80d92da56dae65.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index f3b6993..6539b43 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -109,7 +109,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 109 | public EntityProperties CurrentEntityProperties { get; set; } | 109 | public EntityProperties CurrentEntityProperties { get; set; } |
| 110 | public EntityProperties LastEntityProperties { get; set; } | 110 | public EntityProperties LastEntityProperties { get; set; } |
| 111 | 111 | ||
| 112 | public abstract OMV.Vector3 Scale { get; set; } | 112 | public virtual OMV.Vector3 Scale { get; set; } |
| 113 | public abstract bool IsSolid { get; } | 113 | public abstract bool IsSolid { get; } |
| 114 | public abstract bool IsStatic { get; } | 114 | public abstract bool IsStatic { get; } |
| 115 | 115 | ||