diff options
| author | Melanie | 2013-06-11 01:03:15 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-11 01:03:15 +0100 |
| commit | a022ee576639c1bbceb5c4ba8de3cbd82e538bb3 (patch) | |
| tree | fb0d2ee165b7c87e814fc35c6551a26c2c6a488a /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669 (diff) | |
| download | opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.zip opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.gz opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.bz2 opensim-SC-a022ee576639c1bbceb5c4ba8de3cbd82e538bb3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
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 cca887a..a4c5e08 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -148,7 +148,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 148 | // The asset state is first 'Unknown' then 'Waiting' then either 'Failed' or 'Fetched'. | 148 | // The asset state is first 'Unknown' then 'Waiting' then either 'Failed' or 'Fetched'. |
| 149 | public enum PrimAssetCondition | 149 | public enum PrimAssetCondition |
| 150 | { | 150 | { |
| 151 | Unknown, Waiting, Failed, Fetched | 151 | Unknown, Waiting, FailedAssetFetch, FailedMeshing, Fetched |
| 152 | } | 152 | } |
| 153 | public PrimAssetCondition PrimAssetState { get; set; } | 153 | public PrimAssetCondition PrimAssetState { get; set; } |
| 154 | 154 | ||