diff options
| author | Melanie | 2013-08-13 22:53:47 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-13 22:53:47 +0100 |
| commit | 4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6 (patch) | |
| tree | 245e7c3257c8c6c29356ba5c1eb61ae50a127226 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Eliminate one of the duplicate 'have's in the HG message telling the u... (diff) | |
| download | opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.zip opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.gz opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.bz2 opensim-SC-4a6eff1ee83f88a188936a1a0d4a2c55924ef1c6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 0704591..27caf62 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -175,6 +175,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 175 | public abstract bool IsSolid { get; } | 175 | public abstract bool IsSolid { get; } |
| 176 | public abstract bool IsStatic { get; } | 176 | public abstract bool IsStatic { get; } |
| 177 | public abstract bool IsSelected { get; } | 177 | public abstract bool IsSelected { get; } |
| 178 | public abstract bool IsVolumeDetect { get; } | ||
| 178 | 179 | ||
| 179 | // Materialness | 180 | // Materialness |
| 180 | public MaterialAttributes.Material Material { get; private set; } | 181 | public MaterialAttributes.Material Material { get; private set; } |