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/BSLinkset.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 '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 436e043..4ee047b 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -82,9 +82,9 @@ public abstract class BSLinkset | |||
82 | 82 | ||
83 | // Some linksets have a preferred physical shape. | 83 | // Some linksets have a preferred physical shape. |
84 | // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected. | 84 | // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected. |
85 | public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor) | 85 | public virtual PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor) |
86 | { | 86 | { |
87 | return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN; | 87 | return PhysicsShapeType.SHAPE_UNKNOWN; |
88 | } | 88 | } |
89 | 89 | ||
90 | // Linksets move around the children so the linkset might need to compute the child position | 90 | // Linksets move around the children so the linkset might need to compute the child position |