diff options
| author | Richard Linden <none@none> | 2012-01-31 15:34:44 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-31 15:34:44 -0800 |
| commit | adefcabd6a34d1d02ddfd1f6f208663b0667ac59 (patch) | |
| tree | 1ea96dfa4278d2e00578a568d212113b08ad4589 /indra/newview | |
| parent | 3af08cef719a47cfd728e9f8fab204055d50d6a7 (diff) | |
| parent | 20b46ef6f626c8c7960a4b9c02cae518448497b7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml | 14 |
1 files changed, 12 insertions, 2 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 f4ef63e73e..a04050e7eb 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 @@ -42,6 +42,16 @@ bg_alpha_color="blue" height="11" min_height="0" + visible="true" + background_visible="true"> + <text follows="top|left|right" halign="center" text_color="white">flex</text> + </layout_panel> + <layout_panel name="flex" + auto_resize="true" + user_resize="true" + bg_alpha_color="blue" + height="11" + min_height="0" background_visible="true"> <text follows="top|left|right" halign="center" text_color="white">flex</text> </layout_panel> @@ -61,7 +71,7 @@ background_visible="true"> <text follows="top|left|right" halign="center" text_color="white">flex</text> </layout_panel> - <!--<layout_panel name="flex" + <layout_panel name="flex" auto_resize="true" user_resize="true" visible="false" @@ -69,7 +79,7 @@ height="100" background_visible="true"> <text follows="top|left|right" halign="center" text_color="white">flex</text> - </layout_panel>--> + </layout_panel> <layout_panel name="fixed" auto_resize="false" user_resize="true" |