From a22de1b72a34db2881fea487999f67003500a5fb Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Mon, 13 Dec 2010 18:19:53 -0800
Subject: Re-add convex hull for simple prims and sculpties, as per Falcon's
advice
---
indra/newview/llpanelobject.cpp | 4 +---
1 file changed, 1 insertion(+), 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);
--
cgit v1.2.3