aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
diff options
context:
space:
mode:
authorDiva Canto2013-06-11 15:36:52 -0700
committerDiva Canto2013-06-11 15:36:52 -0700
commita0fed03e1012f76195ac6fd02912bf5979b9a27f (patch)
tree898336047dd123c2603a69d56666c50f18a2b01c /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
parentReally bad idea to lock m_UserCache for so long in UserManagementModule. Adde... (diff)
parentPut the "script saved" and "notecard saved" messages back into the bottom (diff)
downloadopensim-SC_OLD-a0fed03e1012f76195ac6fd02912bf5979b9a27f.zip
opensim-SC_OLD-a0fed03e1012f76195ac6fd02912bf5979b9a27f.tar.gz
opensim-SC_OLD-a0fed03e1012f76195ac6fd02912bf5979b9a27f.tar.bz2
opensim-SC_OLD-a0fed03e1012f76195ac6fd02912bf5979b9a27f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs2
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