diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:30 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:30 +0100 |
commit | cae68b48ec47265c8fd095fbbbb870233cccd52f (patch) | |
tree | 20b24067bef52b664c9c1f9abddbce9db23594aa /indra/newview/skins | |
parent | 43b0a2bde4beecb08585ef1fb9003720cf5cdc7b (diff) | |
parent | 4391b48ed8aba2c004958c3b0630d58b81a0720f (diff) |
merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index b987cd9108..3bb8e9c055 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1425,7 +1425,7 @@ even though the user gets a free copy. height="10" layout="topleft" left_delta="0" - name="label physicsshapetype" + name="label physicsrep" top_pad="10" width="121"> Physics Rep: @@ -1434,18 +1434,18 @@ even though the user gets a free copy. height="23" layout="topleft" follows="left|top" - name="Physics Shape Type Combo Ctrl" - tool_tip="Choose the physics shape type" + name="Physics Rep Combo Ctrl" + tool_tip="Choose the physics representation" left_pad="0" width="108"> <combo_box.item - label="Prim" - name="Prim" - value="Prim" /> + label="Default" + name="Default" + value="Default" /> <combo_box.item - label="None" - name="None" - value="None" /> + label="No Shape" + name="No Shape" + value="No Shape" /> <combo_box.item label="Convex Hull" name="Convex Hull" |