diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 17:39:08 -0400 |
| commit | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch) | |
| tree | 9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/newview/skins/default/xui/en/panel_edit_wearable.xml | |
| parent | 2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff) | |
| parent | f12d79907c7f002666291ab23dbb01ba715fa2c1 (diff) | |
merge out end-of-develop.py tag from viewer-development
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" |