diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-12-09 22:00:01 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-12-09 22:00:01 -0800 |
| commit | 52686947e2643eaa0f1cda03f33bbf1089d3b46d (patch) | |
| tree | 0ac1953df5a44fde129ead1f5d7c3e91eea4bc90 /indra/newview/skins | |
| parent | db1af2445dac667eb24c69d005509b8ff007cc9e (diff) | |
| parent | d8695e8d657568d0ebf6b63ad9cadad7e225afc7 (diff) | |
automated merge
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 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" |