diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-13 18:19:53 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-13 18:19:53 -0800 |
| commit | a22de1b72a34db2881fea487999f67003500a5fb (patch) | |
| tree | 48e13258cbaed677423c8203390cc197633410db /indra/newview | |
| parent | 52686947e2643eaa0f1cda03f33bbf1089d3b46d (diff) | |
Re-add convex hull for simple prims and sculpties,
as per Falcon's advice
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 5c9367e6f6..45e9a04fc2 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1208,15 +1208,13 @@ void LLPanelObject::getState( ) // allow 'Prim' mComboPhysicsShapeType->add(getString("Prim"), LLSD(0)); } - // meshes always allow convex hull - mComboPhysicsShapeType->add(getString("Convex Hull"), LLSD(2)); } else { // simple prims always allow physics shape prim mComboPhysicsShapeType->add(getString("Prim"), LLSD(0)); } - + mComboPhysicsShapeType->add(getString("Convex Hull"), LLSD(2)); mComboPhysicsShapeType->setValue(LLSD(objectp->getPhysicsShapeType())); mComboPhysicsShapeType->setEnabled(editable); |