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

fixed line endings

meow-7.2.2
Leyla Farazha 2010-08-19 14:27:23 -07:00
parent 83253d12f1
commit eaf2359782
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/lltoolpie.cpp
View File

@ -880,14 +880,14 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
}
}
LLAvatarName av_name;
if (LLAvatarNameCache::get(hover_object->getID(), &av_name))
{
final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
}
else
{
final_name = full_name;
LLAvatarName av_name;
if (LLAvatarNameCache::get(hover_object->getID(), &av_name))
{
final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
}
else
{
final_name = full_name;
}
// *HACK: We may select this object, so pretend it was clicked

16
indra/newview/llviewermessage.cpp
View File

@ -3078,14 +3078,14 @@ 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::get(from_id, &av_name))
{
chat.mFromName = av_name.mDisplayName;
}
else
{
chat.mFromName = LLCacheName::cleanFullName(from_name);
LLAvatarName av_name;
if (LLAvatarNameCache::get(from_id, &av_name))
{
chat.mFromName = av_name.mDisplayName;
}
else
{
chat.mFromName = LLCacheName::cleanFullName(from_name);
}
}
else