summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-08-16 04:55:48 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-08-16 04:55:48 +0300
commiteffccb94489d41a533e76f5f5834d52e3e817cbd (patch)
tree3a91e14d1c698708b93e7b64198d3c99fcdce2b4 /indra/newview/skins
parentf744fe8b5496e8d2d357ce88b3552eeee2125a5e (diff)
CHUI-120 WIP Notifications about added chat participants should be sent to the conference when those participants actually join.
- Removed notifying existing P2P participants about ad hoc conference staring in a new window. Now the notifications should arrive in that new window. - Fixed "Cancel" button which had no effect in adding P2P participants notification.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml7
1 files changed, 2 insertions, 5 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 de8d5f22fd..15d3dc30ae 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -36,13 +36,10 @@
value="Conv_toolbar_arrow_sw"/>
<floater.string
name="participant_added"
- value="[NAME] was invited to the conversation.[NEW_WINDOW]"/>
+ value="[NAME] was invited to the conversation."/>
<floater.string
name="multiple_participants_added"
- value="[NAME] were invited to the conversation.[NEW_WINDOW]"/>
- <floater.string
- name="new_window"
- value=" The conversation will be started in a new window."/>
+ value="[NAME] were invited to the conversation."/>
<view
follows="all"
layout="topleft"