summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpanelimcontrolpanel.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml136
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_control_panel.xml164
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml213
5 files changed, 341 insertions, 182 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index 279818d52f..b547997e7a 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -70,9 +70,9 @@ void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::E
void LLPanelChatControlPanel::updateButtons(bool is_call_started)
{
- childSetVisible("end_call_btn", is_call_started);
- childSetVisible("voice_ctrls_btn", is_call_started);
- childSetVisible("call_btn", ! is_call_started);
+ childSetVisible("end_call_btn_panel", is_call_started);
+ childSetVisible("voice_ctrls_btn_panel", is_call_started);
+ childSetVisible("call_btn_panel", ! is_call_started);
}
LLPanelChatControlPanel::~LLPanelChatControlPanel()
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 57e92cdeec..243b63db00 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -14,8 +14,8 @@
visible="true"
width="360"
can_resize="true"
- min_width="360"
- min_height="350">
+ min_width="250"
+ min_height="190">
<layout_stack
follows="all"
height="320"
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index f3a2297151..6c54532a3a 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -5,56 +5,94 @@
height="215"
name="panel_im_control_panel"
width="180">
- <avatar_list
- color="DkGray2"
+ <layout_stack
+ mouse_opaque="false"
+ border_size="0"
+ clip="false"
follows="all"
- height="130"
- ignore_online_status="true"
+ height="215"
layout="topleft"
left="3"
- name="speakers_list"
- opaque="false"
- show_info_btn="false"
- show_profile_btn="false"
- show_speaking_indicator="false"
- top="10"
- width="180" />
- <panel
- background_visible="true"
- bg_alpha_color="DkGray2"
- border="false"
- bottom="1"
- follows="left|right|bottom"
- height="70"
- left="0"
- left_pad="0"
- name="panel_call_buttons"
- top_pad="0"
- width="180">
- <button
- bottom="10"
- follows="all"
- height="20"
- label="Call"
- left_delta="10"
- name="call_btn"
- width="160" />
- <button
- bottom="40"
- follows="all"
- height="20"
- label="Leave Call"
- name="end_call_btn"
- visible="false"
- />
- <button
- follows="all"
- bottom="10"
- height="20"
- label="Voice Controls"
- name="voice_ctrls_btn"
- use_ellipses="true"
- visible="false"
- />
- </panel>
+ name="vertical_stack"
+ orientation="vertical"
+ top="0"
+ width="177">
+ <layout_panel
+ auto_resize="true"
+ follows="top|left"
+ height="130"
+ layout="topleft"
+ min_height="0"
+ mouse_opaque="false"
+ width="180"
+ top="0"
+ name="speakers_list_panel"
+ user_resize="false">
+ <avatar_list
+ color="DkGray2"
+ follows="all"
+ height="130"
+ ignore_online_status="true"
+ layout="topleft"
+ name="speakers_list"
+ opaque="false"
+ show_info_btn="false"
+ show_profile_btn="false"
+ show_speaking_indicator="false"
+ width="180" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="160"
+ name="call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="20"
+ label="Call"
+ name="call_btn"
+ width="160"
+ top="5" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="160"
+ name="end_call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="20"
+ label="Leave Call"
+ name="end_call_btn"
+ top="5"/>
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="160"
+ name="voice_ctrls_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="20"
+ label="Voice Controls"
+ name="voice_ctrls_btn"
+ top="5"
+ use_ellipses="true" />
+ </layout_panel>
+ </layout_stack>
</panel>
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 86b30ebfce..4073ef158b 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
@@ -5,66 +5,110 @@
height="238"
name="panel_im_control_panel"
width="180">
- <avatar_list
- color="DkGray2"
+ <layout_stack
+ mouse_opaque="false"
+ border_size="0"
+ clip="false"
follows="all"
- height="100"
- ignore_online_status="true"
+ height="238"
layout="topleft"
- left="3"
- name="speakers_list"
- opaque="false"
- show_info_btn="false"
- show_profile_btn="false"
- show_speaking_indicator="false"
- top="10"
- width="180" />
- <button
- bottom_pad="0"
- follows="left|right|bottom"
- height="23"
- label="Group Profile"
- left_delta="10"
- name="group_info_btn"
- use_ellipses="true"
- width="160" />
- <panel
- background_visible="true"
- bg_alpha_color="DkGray2"
- border="false"
- follows="left|right|bottom"
- height="70"
- left="0"
- left_pad="0"
- name="panel_call_buttons"
- top_pad="0"
- width="180">
- <button
- bottom="10"
- follows="all"
- height="23"
- label="Call Group"
- left_delta="10"
- name="call_btn"
- use_ellipses="true"
- width="160" />
- <button
- bottom="40"
- follows="all"
- height="23"
- label="Leave Call"
- name="end_call_btn"
- use_ellipses="true"
- visible="false"
- />
- <button
- bottom="10"
- follows="all"
- height="23"
- label="Open Voice Controls"
- name="voice_ctrls_btn"
- use_ellipses="true"
- visible="false"
- />
- </panel>
+ left="5"
+ name="vertical_stack"
+ orientation="vertical"
+ top="0"
+ width="175">
+ <layout_panel
+ auto_resize="true"
+ follows="top|left"
+ height="100"
+ layout="topleft"
+ min_height="0"
+ mouse_opaque="false"
+ width="180"
+ top="0"
+ name="speakers_list_panel"
+ user_resize="false">
+ <avatar_list
+ color="DkGray2"
+ follows="all"
+ height="100"
+ ignore_online_status="true"
+ layout="topleft"
+ name="speakers_list"
+ opaque="false"
+ show_info_btn="false"
+ show_profile_btn="false"
+ show_speaking_indicator="false"
+ width="180" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="group_info_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|right|bottom"
+ height="23"
+ label="Group Profile"
+ name="group_info_btn"
+ use_ellipses="true"
+ top="5"
+ width="160" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="call_btn_panel"
+ user_resize="false">
+ <button
+ follows="all"
+ height="23"
+ label="Call Group"
+ name="call_btn"
+ use_ellipses="true"
+ width="160" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="end_call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="23"
+ label="Leave Call"
+ name="end_call_btn"
+ use_ellipses="true" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="28"
+ layout="topleft"
+ min_height="28"
+ width="160"
+ name="voice_ctrls_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="all"
+ height="23"
+ label="Open Voice Controls"
+ name="voice_ctrls_btn"
+ use_ellipses="true" />
+ </layout_panel>
+ </layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 30e652befd..2e3d5a7320 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -6,84 +6,161 @@
width="110">
<avatar_icon
follows="left|top"
- height="100"
+ height="105"
left_delta="5"
name="avatar_icon"
top="-5"
- width="100"/>
+ width="105"/>
<text
follows="top|left|right"
font="SansSerifLarge"
- height="22"
+ height="19"
layout="topleft"
name="avatar_name"
use_ellipses="true"
value="Unknown"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Profile"
- name="view_profile_btn"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Add Friend"
- name="add_friend_btn"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Teleport"
- name="teleport_btn"
- width="100" />
- <button
- follows="left|top|right"
- height="20"
- label="Share"
- name="share_btn"
- width="100" />
- <!--Removing pay button to save space - will update spec - verified by Erica/Steve -->
- <!-- <button
- follows="left|top|right"
- height="20"
- label="Pay"
- name="pay_btn"
- width="100" />-->
- <panel
- background_visible="true"
- bg_alpha_color="DkGray2"
- border="false"
- top_pad="10"
- follows="left|bottom|right"
- height="70"
- left="1"
- name="panel_call_buttons"
- width="109">
- <button
- bottom="10"
- follows="left|top|right"
- height="20"
- label="Call"
- left_delta="5"
- name="call_btn"
- width="100" />
- <button
- bottom="35"
- follows="left|top|right"
+ width="110" />
+ <layout_stack
+ mouse_opaque="false"
+ border_size="0"
+ clip="false"
+ follows="all"
+ height="168"
+ layout="topleft"
+ left="5"
+ name="button_stack"
+ orientation="vertical"
+ top_pad="0"
+ width="105">
+ <layout_panel
+ mouse_opaque="false"
+ auto_resize="true"
+ follows="top|left"
+ height="0"
+ layout="topleft"
+ left="2"
+ min_height="0"
+ width="100"
+ top="0"
+ name="spacer"
+ user_resize="false" />
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
height="20"
- label="Leave Call"
- name="end_call_btn"
- visible="false"
- width="100" />
+ layout="topleft"
+ min_height="20"
+ width="100"
+ name="view_profile_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Profile"
+ name="view_profile_btn"
+ top="0"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="add_friend_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Add Friend"
+ name="add_friend_btn"
+ top="5"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="teleport_btn_panel"
+ user_resize="false">
<button
- bottom="10"
- follows="left|top|right"
- height="20"
- label="Voice Controls"
- name="voice_ctrls_btn"
- visible="false"
- width="100" />
- </panel>
+ auto_resize="false"
+ follows="left|top|right"
+ height="20"
+ label="Teleport"
+ name="teleport_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="share_btn_panel"
+ user_resize="false">
+ <button
+ auto_resize="true"
+ follows="left|top|right"
+ height="20"
+ label="Share"
+ name="share_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="call_btn_panel"
+ user_resize="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Call"
+ name="call_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="end_call_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Leave Call"
+ name="end_call_btn"
+ width="100" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ follows="top|left|right"
+ height="25"
+ layout="topleft"
+ min_height="25"
+ width="100"
+ name="voice_ctrls_btn_panel"
+ user_resize="false"
+ visible="false">
+ <button
+ follows="left|top|right"
+ height="20"
+ label="Voice Controls"
+ name="voice_ctrls_btn"
+ width="100" />
+ </layout_panel>
+ </layout_stack>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 08:04:39 +0000