diff options
| author | Justin Clark-Casey (justincc) | 2012-11-22 03:01:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-11-22 03:01:26 +0000 |
| commit | 33a4f07c4e4e071abe64694ac0e95681807dc57f (patch) | |
| tree | 376c5038385b21164955bf1331646bd47db552df /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | Add regression test for a good request made to the asset service post handler. (diff) | |
| parent | BulletSim: update DLLs and SOs. No functional changes. Only the parameter blo... (diff) | |
| download | opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.zip opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.tar.gz opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.tar.bz2 opensim-SC_OLD-33a4f07c4e4e071abe64694ac0e95681807dc57f.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 991e5b1..e68b167 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -94,9 +94,9 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 94 | public PrimitiveBaseShape BaseShape { get; protected set; } | 94 | public PrimitiveBaseShape BaseShape { get; protected set; } |
| 95 | // Some types of objects have preferred physical representations. | 95 | // Some types of objects have preferred physical representations. |
| 96 | // Returns SHAPE_UNKNOWN if there is no preference. | 96 | // Returns SHAPE_UNKNOWN if there is no preference. |
| 97 | public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape | 97 | public virtual PhysicsShapeType PreferredPhysicalShape |
| 98 | { | 98 | { |
| 99 | get { return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN; } | 99 | get { return PhysicsShapeType.SHAPE_UNKNOWN; } |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | // When the physical properties are updated, an EntityProperty holds the update values. | 102 | // When the physical properties are updated, an EntityProperty holds the update values. |