DEV-50451 FIX ??? shown in local chat for chat from objects
Simple - was always doing name lookup even if ID was for an objectmaster
parent
0a5ec5da9c
commit
3e4a9614dc
|
|
@ -274,7 +274,7 @@ public:
|
|||
user_name->setValue(mFrom);
|
||||
updateMinUserNameWidth();
|
||||
}
|
||||
else
|
||||
else if (mSourceType == CHAT_SOURCE_AGENT)
|
||||
{
|
||||
// ...from a normal user, lookup the name and fill in later,
|
||||
// but start with blank so sample data from XUI XML doesn't
|
||||
|
|
@ -283,6 +283,13 @@ public:
|
|||
LLAvatarNameCache::get(mAvatarID,
|
||||
boost::bind(&LLChatHistoryHeader::onAvatarNameCache, this, _1, _2));
|
||||
}
|
||||
else {
|
||||
// ...from an object, just use name as given
|
||||
mFrom = chat.mFromName;
|
||||
user_name->setValue(mFrom);
|
||||
updateMinUserNameWidth();
|
||||
}
|
||||
|
||||
|
||||
setTimeField(chat);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue