summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-07-29 16:33:31 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-07-29 16:33:31 -0700
commitf70a559d4394a6552da5167c3f450d5f2befa8e2 (patch)
tree31177dfc6bb01888f0a6a82dfbadf7759a164e98 /indra
parenta5bc2fc0482a0d7239c3cfdb0fd3a53b40af1507 (diff)
DEV-52353 Resident last name shown in user is typing notice in chat
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimfloater.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 38bb96fd6f..a8ec551e58 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -339,6 +339,7 @@ void LLIMFloater::onAvatarNameCache(const LLUUID& agent_id,
// floater title
std::string ui_title = av_name.getCompleteName();
updateSessionName(ui_title, av_name.mDisplayName);
+ mTypingStart.setArg("[NAME]", ui_title);
}
// virtual
@@ -1101,13 +1102,9 @@ void LLIMFloater::addTypingIndicator(const LLIMInfo* im_info)
{
mOtherTyping = true;
- // Create typing is started title string
- LLUIString typing_start(mTypingStart);
- typing_start.setArg("[NAME]", im_info->mName);
-
// Save and set new title
mSavedTitle = getTitle();
- setTitle (typing_start);
+ setTitle (mTypingStart);
// Update speaker
LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);