diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 18:11:03 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 18:11:03 -0800 |
| commit | 7803ba8e0c9e3618bdc2f98289293db36544331d (patch) | |
| tree | 712a38fe34c0c71f788511aaeaefadda76d8eb49 /indra/newview/skins/default/xui | |
| parent | 699eac4ee37b31da78af2323ed15a47e6b386930 (diff) | |
| parent | 5acb1650251138125781b7e21ca8998484f6db85 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_control_panel.xml | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index e972cf39bf..c20aaea2aa 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -10,9 +10,9 @@ top="0" can_close="true" can_dock="true" - can_minimize="true" + can_minimize="false" visible="true" - width="350" + width="300" can_resize="true" min_width="300" min_height="350"> diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index 763dd7b922..2fee2033f6 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -8,7 +8,7 @@ <avatar_list color="DkGray2" follows="left|top|right|bottom" - height="130" + height="100" ignore_online_status="true" layout="topleft" left="3" @@ -32,7 +32,6 @@ background_visible="true" bg_alpha_color="0.2 0.2 0.2 1" border="false" - bottom="1" follows="left|bottom" height="70" left="0" |