diff options
| author | BlueWall | 2012-12-12 23:34:20 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-12 23:34:20 -0500 |
| commit | 7a87c35f94a846e9a2b74d2347c2be5ba0511a38 (patch) | |
| tree | ecb370ecb60a256a0b40787d76932a0d86b78ec4 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Move setting to correct locations in ini (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.zip opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.tar.gz opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.tar.bz2 opensim-SC_OLD-7a87c35f94a846e9a2b74d2347c2be5ba0511a38.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -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 | ||