diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-26 18:23:05 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-03-26 18:23:05 -0700 |
| commit | 92257b55a405f3625cbbcf07357b3ca929a04882 (patch) | |
| tree | d8c2d3b5602d6d0cda87f72f0a13046a1a18ddde /indra/newview/skins/default | |
| parent | 0afe2491ab6a05bf62a2fce438dfdbbaf0b191df (diff) | |
DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, so if it breaks a build, just revert to the previous changeset.
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 aec03b8053..26c08bdf7c 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1419,6 +1419,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 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" |