livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for local chat

meow-7.2.2
Leyla Farazha 2010-08-06 13:06:28 -07:00
parent 7f43506552
commit 9bb2c74dc5
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llviewermessage.cpp
View File

@ -3077,15 +3077,20 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
{
// I don't know if it's OK to change this here, if
// anything downstream does lookups by name, for instance
LLAvatarName av_name;
if (LLAvatarNameCache::useDisplayNames()
&& LLAvatarNameCache::get(from_id, &av_name))
if (LLAvatarNameCache::useDisplayNames())
{
chat.mFromName = av_name.mDisplayName;
}
else
{
chat.mFromName = LLCacheName::cleanFullName(from_name);
LLAvatarName av_name;
LLAvatarNameCache::get(from_id, &av_name);
if (!av_name.mDisplayName.empty())
{
chat.mFromName = av_name.mDisplayName;
}
else
{
chat.mFromName = LLCacheName::cleanFullName(from_name);
}
}
}
else