diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-09 17:04:21 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-09 17:04:21 +0200 |
| commit | 3d42133ecb7671d8284bc0309f8df9e6e7f2df9c (patch) | |
| tree | b2093d7b851761fb990777bee83b1328af14e50d /indra/newview/skins/default/xui | |
| parent | 2813e49d198400a0f6416e01f720bdeb5f506144 (diff) | |
CHUI-362 WIP (Torn off conversation name is highlighted when selected in conversation list with different conversation showing in message panel): implemented the stub panel and a control of it's visibility
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 590ce45c33..e3db3d52ed 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -124,7 +124,47 @@ left="0" name="im_box_tab_container" top="0" - width="412"/> + width="412"> + <panel + follows="all" + layout="topleft" + name="stub_panel" + opaque="true" + top_pad="0" + left="0" + height="430" + width="412"> + <text + type="string" + clip_partial="false" + follows="left|top" + layout="topleft" + left="20" + right="-20" + name="stub_textbox_1" + top="10" + height="20" + valign="center" + wrap="true"> + This conversation is in a separate window. + </text> + <text + type="string" + clip_partial="false" + follows="left|top" + layout="topleft" + left="20" + right="-20" + name="stub_textbox_2" + top="40" + height="20" + valign="center" + parse_urls="false" + wrap="true"> + Bring it back. + </text> + </panel> + </panel_container> </layout_panel> </layout_stack> </multi_floater> |