diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:24:02 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:24:02 -0800 |
| commit | 1be5133116c7e63bc621a4017bedaebf557c83db (patch) | |
| tree | d9985d5fea5a7e04466605d9db7916e7010f4b20 /indra/newview/skins | |
| parent | be1fd73390cab288c75ef99e704f3aa195a0c4ac (diff) | |
SH-541 - Physics mesh display shows inconsistent data.
The object UI was allowing the user to set 'prim' physics for meshes for which
no user physics had been uploaded, or decomposed. It defaulted to convex hull in that case.
The fix is to fix the UI to disallow 'prim' for meshes without physics meshes, limiting
those to only convex hull and none.
We will also redo the task validation to detect invalid states related to this as part
of the 'redo the validation' work
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index f6f74f2ebd..1f79cf310e 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1291,6 +1291,9 @@ even though the user gets a free copy. name="Object" top="16" width="295"> + <panel.string name="None">None</panel.string> + <panel.string name="Prim">Prim</panel.string> + <panel.string name="Convex Hull">Convex Hull</panel.string> <check_box height="19" label="Locked" @@ -1516,20 +1519,7 @@ even though the user gets a free copy. name="Physics Shape Type Combo Ctrl" tool_tip="Choose the physics shape type" left_pad="0" - width="108"> - <combo_box.item - label="Prim" - name="Prim" - value="Prim" /> - <combo_box.item - label="None" - name="None" - value="None" /> - <combo_box.item - label="Convex Hull" - name="Convex Hull" - value="Convex Hull" /> - </combo_box> + width="108"/> <spinner follows="left|top" |