diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-01 17:34:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-01 17:34:45 -0700 |
| commit | 44f6b6ea47e843e10bcc3ce94f2c1aaa8f7f24fb (patch) | |
| tree | 5162371edb4dc450dc912af4c450579168c5c272 /indra/newview/llimview.cpp | |
| parent | 0640f65276ed3ed6a444f4a4dc016d030bc3d31a (diff) | |
| parent | a549d81849aca9e2dbdc375f696b3a3416b68a64 (diff) | |
merge from viewer-beta
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 914e7a3df0..164c51a9e0 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -257,21 +257,17 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& // history files have consistent (English) names in different locales. if (isAdHocSessionType() && IM_SESSION_INVITE == type) { - // Name here has a form of "<Avatar's name> Conference" - // Lets update it to localize the "Conference" word. See EXT-8429. - S32 separator_index = mName.rfind(" "); - std::string name = mName.substr(0, separator_index); - ++separator_index; - std::string conference_word = mName.substr(separator_index, mName.length()); + LLAvatarNameCache::get(mOtherParticipantID, + boost::bind(&LLIMModel::LLIMSession::onAdHocNameCache, + this, _2)); + } +} - // additional check that session name is what we expected - if ("Conference" == conference_word) - { +void LLIMModel::LLIMSession::onAdHocNameCache(const LLAvatarName& av_name) +{ LLStringUtil::format_map_t args; - args["[AGENT_NAME]"] = name; + args["[AGENT_NAME]"] = av_name.getCompleteName(); LLTrans::findString(mName, "conference-title-incoming", args); - } - } } void LLIMModel::LLIMSession::onVoiceChannelStateChanged(const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state, const LLVoiceChannel::EDirection& direction) |