diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-04-23 21:40:41 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-04-23 21:40:41 +0300 |
| commit | c540ef450a2567b18174f8bbe7c115a52c63b743 (patch) | |
| tree | 6e6f2590aafc979e5887da7b7656374227bac761 /indra | |
| parent | 4f02217d9d18f6974b368a4110f76c94e12f2e8f (diff) | |
Fixed normal bug EXT-6893 (Corrupted 'Connecting to conference' notification is shown while connecting to ad-hoc voice chat).
Bug consisted of two problems- showing empty outgoing call floater and corrupted text in outgoing call floater. First was ad-hoc and group call specific and was caused by not showing appropriate text for STATE_READY voice channel state. Second was caused by too small space between "Connecting to..." and "Leaving..." textboxes, which enden in their collision for long names.
- First problem was fixed by adding STATE_READY case into appropriate switch where textboxes are made visible.
- Second was solved by placing "Leaving..." textbox lower
Reviewed by Vadim Sachuk at https://codereview.productengine.com/secondlife/r/310/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_outgoing_call.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 909878207c..f03026715d 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1767,6 +1767,8 @@ void LLOutgoingCallDialog::show(const LLSD& key) getChild<LLTextBox>("leaving")->setVisible(true); } break; + // STATE_READY is here to show appropriate text for ad-hoc and group calls when floater is shown(EXT-6893) + case LLVoiceChannel::STATE_READY : case LLVoiceChannel::STATE_RINGING : if(show_oldchannel) { 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 5ea207675b..9db6568ee3 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -119,7 +119,7 @@ No Answer. Please try again later. layout="topleft" left="77" name="leaving" - top="52" + top="62" width="315" word_wrap="true"> Leaving [CURRENT_CHAT]. |