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

Fix Mac (and maybe linux) builds.

master
Wolfspirit 2011-08-11 08:30:11 +02:00
parent fa5f151332
commit f8739b3f6d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsdata.h
View File

@ -81,7 +81,7 @@ public:
static void callbackReqInfo(const LLSD &notification, const LLSD &response);
static void sendInfo(LLUUID destination, LLUUID sessionid, std::string myName, EInstantMessage dialog);
LLSD FSData::LegacyClientList;
LLSD LegacyClientList;
std::map<std::string, LLSD> blocked_versions;
static LLSD blocked_login_info;

2
indra/newview/llvoavatar.cpp
View File

@ -3305,7 +3305,7 @@ LLColor4 LLVOAvatar::getNameTagColor(bool is_friend)
//Wolfspirit: If we don't display a friend, then use "NameTagV1"
if(use_old_color && color_name!="NameTagFriend"){
if(use_old_color && !(show_friends && is_friend)){
return LLUIColorTable::getInstance()->getColor("NameTagV1");
}