summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-02-10 21:42:39 +0200
committerAndrew Dyukov <adyukov@productengine.com>2010-02-10 21:42:39 +0200
commit7403d53e68550159cb56e44cc898e337cf672aae (patch)
treea7d7428a27d776a94b4078e54f323a52496728f7 /indra/newview/skins/default
parentd86c69c7380704a34b22d88511df124ca357d5c1 (diff)
Fixed normal bug EXT-4566 ([BSI] private chat end floater reports incorrectly who ended the call)
- Added flag to voicechannel which is true when call is ended by agent. - It is sent to imview via signal and used to properly customize text in outgoing call floater. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_outgoing_call.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index cc9afe4474..2bafd1bdef 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -96,13 +96,24 @@ No Answer. Please try again later.
height="40"
layout="topleft"
left="77"
- name="nearby_P2P"
+ name="nearby_P2P_by_other"
top="27"
width="315"
word_wrap="true">
[VOICE_CHANNEL_NAME] has ended the call. [RECONNECT_NEARBY]
</text>
<text
+ font="SansSerifLarge"
+ height="40"
+ layout="topleft"
+ left="77"
+ name="nearby_P2P_by_agent"
+ top="27"
+ width="315"
+ word_wrap="true">
+ You have ended the call. [RECONNECT_NEARBY]
+ </text>
+ <text
font="SansSerif"
height="50"
layout="topleft"