diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 07:35:29 -0400 |
commit | 96adfcfaedb2304661df15223a3df7f701b73493 (patch) | |
tree | 484b3b99cc411a394694721f5b309f07839f1a2a /indra/newview/skins/default/xui/en/panel_edit_wearable.xml | |
parent | 40e14802e3f5bc78546c8ed38fb1a28e46b0dd7c (diff) | |
parent | f41cbc0ac85ae328f2701aab23e94c0ef7ab5758 (diff) |
merge changes for vwr-25269
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_edit_wearable.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_wearable.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index ac8917d272..c8764a6a84 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -72,6 +72,10 @@ Editing Tattoo </string> <string + name="edit_physics_title"> + Editing Physics + </string> + <string name="shape_desc_text"> Shape: </string> @@ -131,6 +135,10 @@ name="tattoo_desc_text"> Tattoo: </string> + <string + name="physics_desc_text"> + Physics: + </string> <!-- Default width of the button should be to show it without label. Button will be extedned in code to show whole label when wearable is being changed. --> @@ -410,6 +418,16 @@ top="8" visible="false" width="333" /> + <panel + filename="panel_edit_physics.xml" + follows="all" + height="425" + layout="topleft" + left="0" + name="edit_physics_panel" + top="8" + visible="false" + width="333" /> </panel> <panel follows="bottom|left|right" |