summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-11-20 18:57:29 +0200
committermaxim_productengine <mnikolenko@productengine.com>2012-11-20 18:57:29 +0200
commit81478d6c4475f4650a23ad0e87496e3d425d5709 (patch)
tree2629a72ea067dcca4096be86e44c3617613424d6 /indra/newview/skins/default
parente52c0218c718fe96a7927f0524c4616022be510e (diff)
CHUI-490 FIXED Small ui changes. Changed sound that is playing when floater is opened.
Call startIM() when user clicks on "Open IM instead" button.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_incoming_call.xml58
1 files changed, 29 insertions, 29 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 81194f61cf..a7864381a9 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,8 +8,8 @@
layout="topleft"
name="incoming call"
help_topic="incoming_call"
- title="Incoming call"
- width="410">
+ sound_flags="0"
+ width="550">
<floater.string
name="lifetime">
5
@@ -24,7 +24,7 @@
</floater.string>
<floater.string
name="VoiceInviteP2P">
- is calling.
+ is calling you.
</floater.string>
<floater.string
name="VoiceInviteAdHoc">
@@ -49,14 +49,14 @@
image_name="icon_avatar_online.tga"
layout="topleft"
left_delta="19"
- top="35"
+ top="20"
width="36" />
<group_icon
enabled="false"
follows="left|top"
height="36"
layout="topleft"
- top="35"
+ top="20"
width="36" />
<text
clip_partial="true"
@@ -67,43 +67,43 @@
name="caller name"
top="20"
use_ellipses="true"
- width="315"
+ width="475"
word_wrap="true" />
- <text
- clip_partial="true"
- font="SansSerif"
- height="30"
- layout="topleft"
- left="77"
- name="question"
- top_pad="5"
- use_ellipses="true"
- width="315"
- word_wrap="true">
- Do you want to leave [CURRENT_CHAT] and join this voice chat?
- </text>
- <button
+ <button
height="24"
- label="Accept"
- label_selected="Accept"
+ label="Answer"
+ label_selected="Answer"
layout="topleft"
left="70"
name="Accept"
- top="92"
- width="100" />
+ top_pad="5"
+ width="120" />
<button
height="24"
- label="Reject"
- label_selected="Reject"
+ label="Ignore"
+ label_selected="Ignore"
layout="topleft"
name="Reject"
left_pad="10"
- width="100" />
+ width="120" />
<button
height="24"
- label="Start IM"
+ label="Open IM instead"
layout="topleft"
name="Start IM"
left_pad="10"
- width="100" />
+ width="120" />
+ <text
+ clip_partial="true"
+ font="SansSerif"
+ height="30"
+ layout="topleft"
+ left="77"
+ name="question"
+ top_pad="5"
+ use_ellipses="true"
+ width="475"
+ word_wrap="true">
+ If you answer, you will be disconnected from your current voice conversation.
+ </text>
</floater>