summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-22 21:40:49 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-22 21:40:49 +0100
commit1bf25c9f4855bd7ea9839461ff3f52c3653c0fb2 (patch)
treeb5f6fffc29ef1c8f4580843f0734dd7fb93b4d84 /indra/newview/skins/default/xui/en
parent467c16401fea5a52a3ca9c526356091d5e778ba7 (diff)
parent9226d42d12b9edb792d65b28254c633d0dc64edc (diff)
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml33
1 files changed, 0 insertions, 33 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 3bb8e9c055..cc9e72cfb5 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1418,39 +1418,6 @@ even though the user gets a free copy.
text_enabled_color="1 1 1 1"
top_pad="3"
width="87" />
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_delta="0"
- name="label physicsrep"
- top_pad="10"
- width="121">
- Physics Rep:
- </text>
- <combo_box
- height="23"
- layout="topleft"
- follows="left|top"
- name="Physics Rep Combo Ctrl"
- tool_tip="Choose the physics representation"
- left_pad="0"
- width="108">
- <combo_box.item
- label="Default"
- name="Default"
- value="Default" />
- <combo_box.item
- label="No Shape"
- name="No Shape"
- value="No Shape" />
- <combo_box.item
- label="Convex Hull"
- name="Convex Hull"
- value="Convex Hull" />
- </combo_box>
<!-- <text
type="string"