From c540ef450a2567b18174f8bbe7c115a52c63b743 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 23 Apr 2010 21:40:41 +0300
Subject: [PATCH] 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
---
indra/newview/llimview.cpp | 2 ++
indra/newview/skins/default/xui/en/floater_outgoing_call.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 909878207c9..f03026715d4 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 5ea207675be..9db6568ee39 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].
--
GitLab