diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:27:03 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-08 21:27:03 -0800 |
| commit | a5ae6f0141a6f80cd21ab4f583fc9f1b5264c5a4 (patch) | |
| tree | 979cf6697a27f09072bf404a471a4712c2dca912 /indra/newview/skins/default/xui | |
| parent | a1e59112d028469870c7d1b38c8dbb56f556959d (diff) | |
| parent | 1be5133116c7e63bc621a4017bedaebf557c83db (diff) | |
automated merge
Diffstat (limited to 'indra/newview/skins/default/xui')
| -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 a263afe2a2..1554ae390f 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" |