livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add convex hull for simple prims and sculpties, 

as per Falcon's advice
master
Roxie Linden 2010-12-13 18:19:53 -08:00
parent 52686947e2
commit a22de1b72a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanelobject.cpp
View File

@ -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);