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 | 006e15495515e6e4c233412a4deed0f34e7b0f12 (patch) | |
tree | e5dfe03e2d932606bc9bfb3de899555c112860a5 /indra/newview/skins | |
parent | 7ee4c5e6ffef66df30c44fd9eb662632f1b4f709 (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')
-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 cc9e72cfb5..3bb8e9c055 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 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" |