summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-09-13 20:10:45 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-09-13 20:10:45 +0300
commit4b52515b543546844835064dfb89e5af2bbbd948 (patch)
treec4d13e2d9c03d2bd59f49180bf40852de363933f /indra/newview/skins/default/xui
parentbe06bebffcc1a08c3018ab3712048599455e025b (diff)
CHUI-282 WIP Fixed conversation list items selection.
Fixed displaying session participants only when session item is open.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_conversation_list_item.xml22
-rw-r--r--indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml9
2 files changed, 20 insertions, 11 deletions
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 d1f25b45fe..375ea79ebe 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
@@ -3,8 +3,8 @@
follows="left|top|right"
height="24"
layout="topleft"
- mouse_opaque="flase"
name="conversation_list_item"
+ mouse_opaque="false"
width="120">
<avatar_icon
follows="top|left"
@@ -12,7 +12,6 @@
default_icon_name="Generic_Person"
layout="topleft"
left="5"
- mouse_opaque="true"
top="2"
width="20" />
<layout_stack
@@ -21,7 +20,8 @@
height="24"
layout="topleft"
left_pad="5"
- name="caonversation_item_stack"
+ mouse_opaque="false"
+ name="conversation_item_stack"
orientation="horizontal"
top="0"
width="90">
@@ -29,6 +29,7 @@
auto_resize="false"
user_resize="false"
height="24"
+ mouse_opaque="false"
name="call_icon_panel"
visible="false"
width="20">
@@ -44,13 +45,11 @@
</layout_panel>
<layout_panel
auto_resize="true"
- user_resize="false"
- left_pad="0"
+ user_resize="false"
height="24"
+ mouse_opaque="false"
name="conversation_title_panel"
- min_dim="50"
- width="70"
- expanded_min_dim="50">
+ width="70">
<text
follows="left|top|right"
font="SansSerifSmall"
@@ -70,9 +69,10 @@
height="16"
layout="topleft"
left_pad="5"
- mouse_opaque="true"
- name="speaking_indicator"
- width="20" />
+ mouse_opaque="true"
+ name="speaking_indicator"
+ visible="false"
+ width="20" />
</layout_panel>
</layout_stack>
</panel>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
new file mode 100644
index 0000000000..f44731ea3d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_session
+ folder_arrow_image="Folder_Arrow"
+ folder_indentation="8"
+ item_height="24"
+ item_top_pad="4"
+ selection_image="Rounded_Square"
+ mouse_opaque="true"
+ follows="left|top|right"/>