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 | 467c16401fea5a52a3ca9c526356091d5e778ba7 (patch) | |
tree | b6f6b8e730fee3295e4792f82bad9983f55a1dfa /indra/newview/skins | |
parent | b42488efa4ce5792e01e1301894a59386c16742a (diff) | |
parent | 91587ab74f80bc95ebb2a06826950468b6b3a460 (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" |