diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-07-12 14:24:18 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-07-12 14:24:18 +0300 |
commit | 50e6e5e49b252b38e48c2020a98e19215a74ca55 (patch) | |
tree | e37502dc2c0ad6099f23d0a7c8fae07053f42fc8 /indra | |
parent | ea35754f08a9a76208d1edd80ed6bc55278eb575 (diff) |
EXT-4301 FIXED Now instance of the LLAvalineListItem is created with "hide phone number" = false.
Note: changes in the llparticipantlist.cpp is a fix of initial implementation in 79c0487c2280 changeset.
"waiting" is shown instead of phone number.
It was not reproduced before because phone was not shown anywhere until this patch.
Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/729/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llavatarlist.cpp | 2 | ||||
-rw-r--r-- | indra/newview/llparticipantlist.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 3275d784a3..99156b9d9d 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -211,7 +211,7 @@ void LLAvatarList::setDirty(bool val /*= true*/, bool force_refresh /*= false*/) void LLAvatarList::addAvalineItem(const LLUUID& item_id, const LLUUID& session_id, const std::string& item_name) { LL_DEBUGS("Avaline") << "Adding avaline item into the list: " << item_name << "|" << item_id << ", session: " << session_id << LL_ENDL; - LLAvalineListItem* item = new LLAvalineListItem; + LLAvalineListItem* item = new LLAvalineListItem(/*hide_number=*/false); item->setAvatarId(item_id, session_id, true, false); item->setName(item_name); diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 8fe78a0f81..f2e6969998 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -582,7 +582,7 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) else { std::string display_name = LLVoiceClient::getInstance()->getDisplayName(avatar_id); - mAvatarList->addAvalineItem(avatar_id, mSpeakerMgr->getSessionID(), display_name.empty() ? display_name : LLTrans::getString("AvatarNameWaiting")); + mAvatarList->addAvalineItem(avatar_id, mSpeakerMgr->getSessionID(), display_name.empty() ? LLTrans::getString("AvatarNameWaiting") : display_name); mAvalineUpdater->watchAvalineCaller(avatar_id); } adjustParticipant(avatar_id); |