diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-27 11:55:29 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-27 11:55:29 +0000 |
| commit | 6388ae033d453e40b8fa7851b57133a86bef06db (patch) | |
| tree | c35a45342f6512dcfd0f40faa8bc9569fc59a68e /indra/newview/skins/default | |
| parent | 28bdead9e5c77c6bcd557de58410838dc6cc4e15 (diff) | |
| parent | 68dcd596e52797aa048c4942b96c04889e73d957 (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_landmarks.xml | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_place_profile.xml | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index fdc26b5c46..ee8bca6f83 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -10,10 +10,10 @@ border="false" background_visible="true" bg_alpha_color="DkGray2" - follows="left|top|right|bottom"> + follows="all"> <accordion - follows="left|top|right|bottom" - height="368" + follows="all" + height="360" layout="topleft" left="0" name="landmarks_accordion" @@ -27,7 +27,7 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" + follows="all" height="126" left="0" mouse_opaque="true" @@ -43,7 +43,7 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" + follows="all" height="126" left="0" mouse_opaque="true" @@ -59,7 +59,7 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" + follows="all" height="126" left="0" mouse_opaque="true" @@ -75,8 +75,8 @@ allow_multi_select="true" border="false" bottom="0" - follows="left|top|right|bottom" - height="120" + follows="all" + height="126" left="0" mouse_opaque="true" name="library_list" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 7672bd0799..44b2508e56 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -174,7 +174,7 @@ <panel bg_alpha_color="DkGray2" follows="left|top|right" - height="532" + height="540" layout="topleft" left="0" min_height="300" @@ -318,7 +318,7 @@ width="268" /> <accordion follows="all" - height="230" + height="223" layout="topleft" left="0" name="advanced_info_accordion" |