diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-12 10:36:21 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-12 10:36:21 -0800 |
| commit | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (patch) | |
| tree | b8c8829f735b4baa56da52b65d31d9265004e375 /indra/newview/skins | |
| parent | c9044c03b3157c330a0b3b640bfce6bacc0c9343 (diff) | |
| parent | ab5a0a1d4d0a029dd92c9fc108638736a57ce7c6 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 42 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 26 |
2 files changed, 54 insertions, 14 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..1388b9e474 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="true" + wrap="true"> + [secondlife:/// Bring it back.] + </text> + </panel> + </panel_container> </layout_panel> </layout_stack> </multi_floater> 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 a889eb7933..1d74f1bc25 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -203,7 +203,7 @@ name="translate_chat_checkbox_lp" top_delta="0" visible="true" - width="230"> + width="210"> <check_box top="10" control_name="TranslateChat" @@ -217,7 +217,7 @@ </layout_panel> <layout_panel height="248" - width="230" + width="210" layout="topleft" follows="all" left_delta="0" @@ -227,17 +227,17 @@ user_resize="true" auto_resize="true" name="chat_holder"> - <chat_history - font="SansSerifSmall" - follows="all" - visible="true" - height="240" - name="chat_history" - parse_highlights="true" - parse_urls="true" - width="230" - left="5"> - </chat_history> + <chat_history + font="SansSerifSmall" + follows="all" + visible="true" + height="240" + name="chat_history" + parse_highlights="true" + parse_urls="true" + right="-5" + left="5"> + </chat_history> </layout_panel> </layout_stack> </panel> |