diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 19:45:19 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 19:45:19 +0100 |
| commit | 9bdbc10aba78d7c6fec832ee4c411b483f05c441 (patch) | |
| tree | 815b58b072d2f3e5dbead85e954b3e4e8c2575d5 /indra/newview/skins/default | |
| parent | e562a200b69c39f60540019ef0ec7423ace04bef (diff) | |
| parent | 17d5a40f8a6681151f0530c342174c5321d664eb (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index c594448df7..37dbd8a670 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1418,6 +1418,39 @@ 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 physicsshapetype" + top_pad="10" + width="121"> + Physics Shape Type: + </text> + <combo_box + height="23" + layout="topleft" + follows="left|top" + 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> <!-- <text type="string" |