diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-13 18:20:37 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-13 18:20:37 -0800 |
| commit | 4351160958efa1c352e8af1ab3f48c1486ba9c5c (patch) | |
| tree | 8306feebfcd484eefc692f43edc0cbc0996c6e4c /indra/newview | |
| parent | 4a61efdee973e58e021e4c1564ed5c33e750f92f (diff) | |
| parent | a22de1b72a34db2881fea487999f67003500a5fb (diff) | |
automated merge
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); |