summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml57
-rw-r--r--indra/newview/skins/default/xui/en/panel_conversation_list_item.xml56
2 files changed, 52 insertions, 61 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 15f02ab9c3..f61e5f1acc 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -266,37 +266,32 @@
left="0"
right="-1">
<layout_panel
+ auto_resize="false"
+ name="session_icon_layout_panel"
+ width="24">
+ <avatar_icon
+ follows="left|bottom"
+ name="avatar_icon"
+ height="20"
+ default_icon_name="Generic_Person"
+ layout="topleft"
+ left="3"
+ bottom="-9"
+ visible="false"
+ width="20" />
+ <group_icon
+ follows="left|bottom"
+ name="group_chat_icon"
+ height="20"
+ default_icon_name="Generic_Group"
+ layout="topleft"
+ left="3"
+ bottom="-9"
+ visible="false"
+ width="20" />
+ </layout_panel>
+ <layout_panel
name="input_editor_layout_panel">
- <avatar_icon
- follows="left|bottom"
- name="avatar_icon"
- height="20"
- default_icon_name="Generic_Person"
- layout="topleft"
- left="3"
- bottom="-9"
- visible="false"
- width="20" />
- <group_icon
- follows="left|bottom"
- name="group_chat_icon"
- height="20"
- default_icon_name="Generic_Group"
- layout="topleft"
- left="3"
- bottom="-9"
- visible="false"
- width="20" />
- <icon
- follows="left|bottom"
- height="20"
- image_name="Nearby_chat_icon"
- layout="topleft"
- left="3"
- bottom="-9"
- name="nearby_chat_icon"
- visible="false"
- width="20"/>
<chat_editor
layout="topleft"
expand_lines_count="5"
@@ -310,7 +305,7 @@
spellcheck="true"
tab_group="3"
bottom="-8"
- left_pad="5"
+ left="5"
right="-5"
wrap="true" />
</layout_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
index 4372cf69bf..3be2beb0aa 100644
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -6,45 +6,41 @@
name="conversation_list_item"
mouse_opaque="false"
width="120">
- <avatar_icon
- follows="top|left"
- height="20"
- default_icon_name="Generic_Person"
- layout="topleft"
- left="9"
- top="2"
- visible="false"
- width="20" />
- <group_icon
- follows="top|left"
- height="20"
- default_icon_name="Generic_Group"
- layout="topleft"
- left="9"
- top="2"
- visible="false"
- width="20" />
- <icon
- follows="top|left"
- height="20"
- image_name="Nearby_chat_icon"
- layout="topleft"
- left="10"
- name="nearby_chat_icon"
- top="3"
- visible="false"
- width="20"/>
+
<layout_stack
animate="false"
follows="all"
height="24"
layout="topleft"
- left="30"
+ left="9"
mouse_opaque="false"
name="conversation_item_stack"
orientation="horizontal"
top="0"
- width="90">
+ width="109">
+ <layout_panel
+ auto_resize="false"
+ name="session_icon_panel"
+ width="24">
+ <avatar_icon
+ follows="top|left"
+ height="20"
+ default_icon_name="Generic_Person"
+ layout="topleft"
+ left="0"
+ top="2"
+ visible="false"
+ width="20" />
+ <group_icon
+ follows="top|left"
+ height="20"
+ default_icon_name="Generic_Group"
+ layout="topleft"
+ left="0"
+ top="2"
+ visible="false"
+ width="20" />
+ </layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"