diff options
author | dolphin <dolphin@lindenlab.com> | 2014-12-05 13:46:28 -0800 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-12-05 13:46:28 -0800 |
commit | d70125cc34681f77a31830601b5fcf3356c3da77 (patch) | |
tree | f4a4e5b226da4238871ce1f4f9ff5d114e22d1d8 /indra/newview/skins/default/xui/en | |
parent | 62db156552c29f44e060b12c51c429db1a7f5788 (diff) | |
parent | 0c959fd99216c48378b8e8259d1adb358d0201b1 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_experience_list_editor.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_experiences.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml index e6b88ae534..c76b958eda 100644 --- a/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml +++ b/indra/newview/skins/default/xui/en/panel_experience_list_editor.xml @@ -51,7 +51,7 @@ draw_heading="false" left="3" width="225" - height="77" + height="75" follows="all" name="experience_list"> <columns diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml index d909731809..bced46f7dc 100644 --- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml +++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml @@ -66,7 +66,7 @@ Blocked Experiences may not run on this parcel. orientation="vertical"> <layout_panel follows="all" - height="50" + height="93" min_height="50" width="530" visible="false" @@ -89,7 +89,7 @@ Blocked Experiences may not run on this parcel. </text> </layout_panel> <layout_panel - height="50" + height="93" min_height="50" follows="all" width="530"> @@ -111,7 +111,7 @@ Blocked Experiences may not run on this parcel. </text> </layout_panel> <layout_panel - height="50" + height="93" min_height="50" follows="all" width="530"> |