diff options
| author | Richard Linden <none@none> | 2012-01-17 16:05:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-17 16:05:29 -0800 |
| commit | c738523b9056c530f9f0f48aebc2d405760f1415 (patch) | |
| tree | 1ac3a547d2b79270b27d8b343242722fba48e18b /indra/newview | |
| parent | 652ef621543497aa947970d374285d8f851ed682 (diff) | |
| parent | 1fede65af23248293d4033b8f7557875b499e191 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml index dbe75f8b53..f95f21e63a 100644 --- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml +++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml @@ -26,31 +26,14 @@ background_visible="true"> <text follows="top|left|right" halign="center" text_color="white">flex</text> </layout_panel> - <layout_panel name="fixed" - auto_resize="false" - user_resize="true" - height="50" - min_height="0" - bg_alpha_color="green" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="fixed" - auto_resize="false" + <layout_panel name="flex" + auto_resize="true" user_resize="true" - height="50" + bg_alpha_color="blue" + height="11" min_height="0" - bg_alpha_color="green" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> - </layout_panel> - <layout_panel name="fixed" - auto_resize="false" - user_resize="true" - height="50" - bg_alpha_color="green" - background_visible="true"> - <text follows="top|left|right" halign="center" text_color="black">fixed</text> + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> </layout_panel> </layout_stack> <layout_stack name="test_stack" |