diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
| commit | f8b51f40289255ce38f65830f5bb0f29def3b757 (patch) | |
| tree | 43712a7aa38e35d297eba4c74eaa7f03930f777c /indra/newview/skins | |
| parent | d0d8ee87e7648e80b83b125202d6270495e955b6 (diff) | |
| parent | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_people.xml | 6 |
2 files changed, 15 insertions, 3 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 faf54774f6..e4b127b7b9 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -106,6 +106,18 @@ name="voice_call_btn" tool_tip="Open voice connection" width="31"/> + <output_monitor + auto_update="true" + follows="top|left" + draw_border="false" + height="16" + layout="topleft" + top="10" + left_pad="10" + mouse_opaque="true" + name="speaking_indicator" + visible="false" + width="20" /> <button follows="right|top" height="25" diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml index 5f475baa93..701233ba4a 100644 --- a/indra/newview/skins/default/xui/en/floater_people.xml +++ b/indra/newview/skins/default/xui/en/floater_people.xml @@ -6,7 +6,7 @@ can_resize="true" height="570" help_topic="sidebar_people" - min_height="440" + min_height="220" min_width="260" layout="topleft" name="floater_people" @@ -14,13 +14,13 @@ single_instance="true" reuse_instance="true" title="PEOPLE" - width="390"> + width="370"> <panel_container default_panel_name="panel_people" follows="all" height="570" name="main_panel" - width="390"> + width="370"> <panel class="panel_people" name="panel_people" |