diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-09 19:12:49 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-09 19:12:49 -0800 |
| commit | 830972204912ccb212da3550f31820a6cf343779 (patch) | |
| tree | 9d5e2cb9bfba9daa4d455e8b9f9c4b014e84529e /indra/newview/skins | |
| parent | 60eaa8875df45f023c3bf0fb82863b05cb5a090f (diff) | |
| parent | 41d5f820ea1859493b7f14d9d81b145a6a3b38b6 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 30 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_participant_view.xml | 2 |
2 files changed, 9 insertions, 23 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 951665552f..12c1676127 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -161,32 +161,18 @@ <text type="string" clip_partial="false" - follows="left|top" + follows="left|top|right" layout="topleft" - left="20" - right="-20" - name="stub_textbox_1" - top="30" - 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="60" - height="20" + left="15" + right="-15" + name="stub_textbox" + top="25" + height="40" valign="center" parse_urls="true" wrap="true"> - [secondlife:/// Bring it back.] - </text> + This conversation is in a separate window. [secondlife:/// Bring it back.] + </text> </panel> </panel_container> </layout_panel> diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml index 33d7bd7c01..2f2bafb95d 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_view.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml @@ -76,7 +76,7 @@ parameter="privacy_preferences" /> </menu_item_call> <menu_item_check - label="Open conversation log" + label="Conversation log..." name="Conversation" visible="true"> <menu_item_check.on_check |