diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-04-09 18:29:32 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-04-09 18:29:32 +0300 |
| commit | cf9af33a1ab7062325bc45feff0335c525e44499 (patch) | |
| tree | 6e7dc52b113b405329ef267db503ce699a5fe6a6 /indra/newview/llimview.cpp | |
| parent | a782eaf36e5cd4edc74ade855db8582213ae7c0f (diff) | |
Fixed normal bug EXT-6319 (Rejected voice call says "user Joined the voice call").
- Removed names from strings containing info about other user joining or ending the call to make them more general. See comment to JIRA ticket for more info.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/210/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index e0f155a6a9..92b994ad67 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -297,7 +297,7 @@ void LLIMModel::LLIMSession::onVoiceChannelStateChanged(const LLVoiceChannel::ES LLIMModel::getInstance()->addMessage(mSessionID, SYSTEM_FROM, LLUUID::null, message); break; case LLVoiceChannel::STATE_CONNECTED : - message = other_avatar_name + " " + joined_call; + message = LLTrans::getString("answered_call"); LLIMModel::getInstance()->addMessage(mSessionID, SYSTEM_FROM, LLUUID::null, message); default: break; @@ -1713,7 +1713,6 @@ void LLOutgoingCallDialog::show(const LLSD& key) channel_name = LLTextUtil::formatPhoneNumber(channel_name); } childSetTextArg("nearby", "[VOICE_CHANNEL_NAME]", channel_name); - childSetTextArg("nearby_P2P_by_other", "[VOICE_CHANNEL_NAME]", mPayload["disconnected_channel_name"].asString()); // skipping "You will now be reconnected to nearby" in notification when call is ended by disabling voice, // so no reconnection to nearby chat happens (EXT-4397) |