diff options
| author | Justin Clark-Casey (justincc) | 2013-08-12 22:57:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-12 22:57:32 +0100 |
| commit | 4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1 (patch) | |
| tree | f9e4bb133ee97106561ecffb9f74c384183bd525 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Make show bots pCampbot console command print connected, connecting, etc. bot... (diff) | |
| parent | BulletSim: add check in avatar stair step code to verify the collision (diff) | |
| download | opensim-SC_OLD-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.zip opensim-SC_OLD-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.tar.gz opensim-SC_OLD-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.tar.bz2 opensim-SC_OLD-4f8c691f8c1c56cc74c5f8a6e95d0867dfe4a1a1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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; } |