diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-21 18:37:26 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-21 18:37:26 -0700 |
| commit | 05e2814261f1581169772f3917f1e82ad7521af9 (patch) | |
| tree | 3496e856792d8d52e8c3b973082f18a266b5fdf1 /indra/newview/skins/default | |
| parent | 5676e4a62efd2636840395a0667e3df3a48f1989 (diff) | |
| parent | 51bdbc9481f6194b2851ee51c98d671e8b952aca (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_topinfo_bar.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index 93a04050b6..6807b01fa3 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -89,7 +89,7 @@ visible="true" width="20" /> </layout_panel> - <layout_panel name="leave_call_panel" height="26" auto_resize="false"> + <layout_panel name="leave_call_panel" height="26" min_height="26" user_resize="false" auto_resize="false"> <layout_stack clip="true" follows="left|top|right" diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml index 79f29777ce..fc527f5f9d 100644 --- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml @@ -4,7 +4,7 @@ background_opaque="false" bg_opaque_color="Black_50" bg_alpha_color="Black_50" - follows="left|top|right" + follows="left|top" height="19" layout="topleft" name="topinfo_bar" |