diff options
author | Robert Adams | 2014-07-26 16:03:43 -0700 |
---|---|---|
committer | Justin Clark-Casey | 2014-08-02 00:58:27 +0100 |
commit | eedefdc5ff17f52c106d6832bc0cd8c596aefe62 (patch) | |
tree | af3ef82909396f34b75485f2c67e9e3d069b0758 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | Add inventory.<url>.RequestsMade stat. (diff) | |
download | opensim-SC_OLD-eedefdc5ff17f52c106d6832bc0cd8c596aefe62.zip opensim-SC_OLD-eedefdc5ff17f52c106d6832bc0cd8c596aefe62.tar.gz opensim-SC_OLD-eedefdc5ff17f52c106d6832bc0cd8c596aefe62.tar.bz2 opensim-SC_OLD-eedefdc5ff17f52c106d6832bc0cd8c596aefe62.tar.xz |
BulletSim: rearrange code for sensing whether shapes have been
constructed.
Add routine to check for failed and use that method rather than
checking individual state.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 7a46550..75ffeb4 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -159,6 +159,11 @@ public abstract class BSPhysObject : PhysicsActor | |||
159 | Unknown, Waiting, FailedAssetFetch, FailedMeshing, Fetched | 159 | Unknown, Waiting, FailedAssetFetch, FailedMeshing, Fetched |
160 | } | 160 | } |
161 | public PrimAssetCondition PrimAssetState { get; set; } | 161 | public PrimAssetCondition PrimAssetState { get; set; } |
162 | public virtual bool AssetFailed() | ||
163 | { | ||
164 | return ( (this.PrimAssetState == PrimAssetCondition.FailedAssetFetch) | ||
165 | || (this.PrimAssetState == PrimAssetCondition.FailedMeshing) ); | ||
166 | } | ||
162 | 167 | ||
163 | // The objects base shape information. Null if not a prim type shape. | 168 | // The objects base shape information. Null if not a prim type shape. |
164 | public PrimitiveBaseShape BaseShape { get; protected set; } | 169 | public PrimitiveBaseShape BaseShape { get; protected set; } |