diff options
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 137 |
2 files changed, 52 insertions, 87 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 1468f6d584..0025c10b24 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -314,7 +314,7 @@ void LLCallFloater::updateSession() //hide "Leave Call" button for nearby chat bool is_local_chat = mVoiceType == VC_LOCAL_CHAT; - childSetVisible("leave_call_btn", !is_local_chat); + childSetVisible("leave_call_btn_panel", !is_local_chat); refreshParticipantList(); updateAgentModeratorState(); 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 b9649e9c57..c4a51bcff0 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -5,7 +5,7 @@ can_close="false" height="270" layout="topleft" - min_height="122" + min_height="280" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" @@ -37,23 +37,23 @@ name="max_visible_items"> 5 </string> - <panel - bevel_style="out" - border="true" - follows="left|right|top" - height="62" - layout="topleft" - left="0" - name="control_panel" - top="0" - width="282"> - <panel - height="18" - follows="top|left|right" + <layout_stack + clip="false" + follows="all" + height="262" layout="topleft" left="10" - name="my_panel" + mouse_opaque="false" + name="my_call_stack" + orientation="vertical" width="263"> + <layout_panel + follows="top|left|right" + user_resize="false" + auto_resize="false" + layout="topleft" + height="26" + name="my_panel"> <avatar_icon enabled="false" follows="left|top" @@ -79,92 +79,57 @@ <output_monitor auto_update="true" draw_border="false" - follows="right" + follows="top|right" height="16" layout="topleft" name="speaking_indicator" - right="-1" - top="2" + left_pad="5" visible="true" width="20" /> - </panel> - <layout_stack - border_size="0" - clip="false" - follows="all" - height="28" - layout="topleft" - left="10" - mouse_opaque="false" - name="leave_call_stack" - orientation="horizontal" - top_pad="5" - width="263"> - <layout_panel - auto_resize="true" - follows="left|right" - height="26" - layout="topleft" - min_height="23" - min_width="5" - mouse_opaque="false" - name="left_anchor" - width="80"/> + </layout_panel> <layout_panel auto_resize="false" - follows="left|right" + user_resize="false" + follows="top|left" height="26" + visible="true" layout="topleft" - mouse_opaque="false" - min_height="24" - min_width="100" name="leave_call_btn_panel" width="100"> <button - follows="left|right" - height="24" + follows="right|top" + height="23" + top_pad="0" label="Leave Call" - left="0" name="leave_call_btn" - top="0" width="100" /> </layout_panel> - <layout_panel - auto_resize="true" - follows="left|right" - height="26" + <layout_panel + follows="all" + layout="topleft" + left="2" + top_pad="0" + height="205" + name="callers_panel" + user_resize="false" + width="280"> + <avatar_list + follows="all" + height="205" + ignore_online_status="true" layout="topleft" - mouse_opaque="false" - min_height="24" - min_width="5" - name="right_anchor" - width="80"/> - </layout_stack> - </panel> - <avatar_list - follows="all" - height="197" - ignore_online_status="true" - layout="topleft" - left="0" - multi_select="true" - name="speakers_list" - width="282" /> - <panel - filename="panel_avatar_list_item.xml" - follows="left|right|top" - height="24" - layout="topleft" - left="0" - name="non_avatar_caller" - top="70" - width="282" /> - <view_border - bevel_style="out" - follows="left|top|right|bottom" - height="206" - layout="topleft" - left="0" - top="63" - width="282" /> + multi_select="true" + name="speakers_list" + width="280" /> + <panel + filename="panel_avatar_list_item.xml" + follows="left|right|top" + height="24" + layout="topleft" + left="0" + name="non_avatar_caller" + top="10" + width="276" /> + </layout_panel> + </layout_stack> </floater> |