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

Fix build failures on Mac : suppress cruft that tripped gcc

meow-7.2.2
Merov Linden 2013-04-23 17:15:22 -07:00
parent 2ca3612dae
commit 6aa08021c7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpersontabview.cpp
View File

@ -117,7 +117,7 @@ void LLPersonView::draw()
const LLFontGL * font = LLFontGL::getFontSansSerifSmall();
F32 text_left = (F32)getLabelXPos();
F32 y = (F32)getRect().getHeight() - font->getLineHeight() - (F32)mTextPad;
LLColor4 color = color = mIsSelected ? sHighlightFgColor : sFgColor;
LLColor4 color = mIsSelected ? sHighlightFgColor : sFgColor;
F32 right_x = 0;
drawLabel(font, text_left, y, color, right_x);

3
indra/newview/llsociallist.cpp
View File

@ -1,4 +1,3 @@
sDestroyImmediate
/**
* @file llsociallist.cpp
* @brief Implementation of llsociallist
@ -37,7 +36,7 @@ sDestroyImmediate
#include "llavatarnamecache.h"
#include "lloutputmonitorctrl.h"
#include "lltextutil.h"
static LLDefaultChildRegistry::Register<LLSocialList> r("social_list");
LLSocialList::LLSocialList(const Params&p) : LLFlatListViewEx(p)