diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 20:47:27 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-26 20:47:27 +0000 |
commit | af98aad98d43ec8b128ecac3089426d6ae6edc3f (patch) | |
tree | 5971f87afc04580df470a003793dcc8c974e29a7 /indra/newview/skins/default/xui/en/panel_profile_view.xml | |
parent | 6a364e6f32c12c1ab2c0f33e8ef07d885a8765a2 (diff) |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_profile_view.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile_view.xml | 76 |
1 files changed, 48 insertions, 28 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 6d7cabc5c0..e710774232 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -40,33 +40,53 @@ tab_stop="false" top="0" width="25" /> - <tab_container - follows="left|top|right|bottom" - height="420" - layout="topleft" - left="10" - name="tabs" - tab_min_width="75" - tab_position="top" - top_pad="15" - width="285"> - <panel - class="panel_profile" - filename="panel_profile.xml" - label="Profile" - layout="topleft" - name="panel_profile" /> - <panel - class="panel_picks" - filename="panel_picks.xml" - label="Picks" - layout="topleft" - name="panel_picks" /> - <panel - class="panel_notes" - filename="panel_notes.xml" - label="Notes & Privacy" + <layout_stack + name="layout_stack" + orientation="vertical" layout="topleft" - name="panel_notes" /> - </tab_container> + follows="all" + left="0" + top="50" + height="500" + width="305" + border_size="0"> + <panel + name="stack_panel" + follows="all" + layout="topleft" + top="0" + left="0" + height="500" + width="305"> + <tab_container + follows="all" + height="500" + layout="topleft" + left="10" + name="tabs" + tab_min_width="75" + tab_position="top" + top="0" + width="280"> + <panel + class="panel_profile" + filename="panel_profile.xml" + label="Profile" + layout="topleft" + name="panel_profile" /> + <panel + class="panel_picks" + filename="panel_picks.xml" + label="Picks" + layout="topleft" + name="panel_picks" /> + <panel + class="panel_notes" + filename="panel_notes.xml" + label="Notes & Privacy" + layout="topleft" + name="panel_notes" /> + </tab_container> + </panel> + </layout_stack> </panel> |