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

Trivial whitespace cleanup...

Cinders 2013-03-22 18:16:47 -06:00
parent 8736b53149
commit 5572302504
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llmessage/llavatarnamecache.cpp
View File

@ -657,8 +657,8 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
if(LGGContactSets::getInstance()->hasPseudonym(agent_id))
{
LLSD info = av_name->asLLSD();
info["is_display_name_default"]=LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id);
info["display_name"]=LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id)?(info["legacy_first_name"].asString()+" "+info["legacy_last_name"].asString()):LGGContactSets::getInstance()->getPseudonym(agent_id);
info["is_display_name_default"] = LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id);
info["display_name"] = LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id)?(info["legacy_first_name"].asString() + " " + info["legacy_last_name"].asString()) : LGGContactSets::getInstance()->getPseudonym(agent_id);
av_name->fromLLSD(info);
}
@ -731,8 +731,8 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& ag
{
LL_DEBUGS("AvNameCache") << "DN cache hit via alias" << llendl;
LLSD info = av_name.asLLSD();
info["is_display_name_default"]=LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id);
info["display_name"]=LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id)?(info["legacy_first_name"].asString()+" "+info["legacy_last_name"].asString()):LGGContactSets::getInstance()->getPseudonym(agent_id);
info["is_display_name_default"] = LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id);
info["display_name"] = LGGContactSets::getInstance()->hasDisplayNameRemoved(agent_id)?(info["legacy_first_name"].asString() + " " + info["legacy_last_name"].asString()) : LGGContactSets::getInstance()->getPseudonym(agent_id);
av_name.fromLLSD(info);
}

2
indra/newview/llcallingcard.cpp
View File

@ -799,7 +799,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
// <FS:PP> Attempt to speed up things a little
// if(chat_notify||LGGContactSets::getInstance()->notifyForFriend(agent_id)||gSavedSettings.getBOOL("OnlineOfflinetoNearbyChat"))
static LLCachedControl<bool> OnlineOfflinetoNearbyChat(gSavedSettings, "OnlineOfflinetoNearbyChat");
if(chat_notify||LGGContactSets::getInstance()->notifyForFriend(agent_id)||OnlineOfflinetoNearbyChat)
if(chat_notify || LGGContactSets::getInstance()->notifyForFriend(agent_id) || OnlineOfflinetoNearbyChat)
// </FS:PP>
{
// Look up the name of this agent for the notification

2
indra/newview/llnetmap.cpp
View File

@ -612,7 +612,7 @@ void LLNetMap::draw()
// </FS:Ansariel> Mark Avatars with special colors
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(uuid,FALSE,FALSE,FALSE,TRUE))
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(uuid, FALSE, FALSE, FALSE, TRUE))
{
color = LGGContactSets::getInstance()->getFriendColor(uuid);
}

2
indra/newview/llviewerchat.cpp
View File

@ -76,7 +76,7 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, bool is_l
r_color = LLUIColorTable::instance().getColor("AgentChatColor");
}
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(chat.mFromID,TRUE))
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(chat.mFromID, TRUE))
{
r_color = LGGContactSets::getInstance()->getFriendColor(chat.mFromID);
}

9
indra/newview/llvoavatar.cpp
View File

@ -2709,7 +2709,8 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// if we aren't self, if we use colored Clienttags and if we have a color
// then use that color as name_tag_color
static LLUICachedControl<bool> show_friends("NameTagShowFriends");
if(mClientTagData.has("color") && !(show_friends && (is_friend||LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(),FALSE,TRUE))) && gSavedSettings.getU32("FSColorClienttags")>0 && !this->isSelf()){
if(mClientTagData.has("color") && !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), FALSE, TRUE))) && gSavedSettings.getU32("FSColorClienttags") > 0 && !this->isSelf())
{
name_tag_color = mClientTagData["color"];
}
@ -2752,7 +2753,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// Override nametag color only if friend color is disabled
// or avatar is not a friend nor has a contact set color
if (show_distance_color_tag && !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(),FALSE,TRUE))))
if (show_distance_color_tag && !(show_friends && (is_friend || LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), FALSE, TRUE))))
{
name_tag_color = distance_color;
}
@ -2951,7 +2952,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
LLColor4 new_chat = LLUIColorTable::instance().getColor( isSelf() ? "UserChatColor" : "AgentChatColor" );
//color based on contact sets prefs
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(),TRUE))
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), TRUE))
{
new_chat = LGGContactSets::getInstance()->getFriendColor(getID());
}
@ -3147,7 +3148,7 @@ LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
}
}
if(LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(),FALSE,TRUE))
if (LGGContactSets::getInstance()->hasFriendColorThatShouldShow(getID(), FALSE, TRUE))
{
return LGGContactSets::getInstance()->getFriendColor(getID());
}