diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-23 17:15:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-23 17:15:22 -0700 |
| commit | 6aa08021c75d2674002c766b3bc02ea8773ee35f (patch) | |
| tree | d207d52a1db9fc985accbc9e1b46cf292879a159 | |
| parent | 2ca3612dae3258b489df8e47879f8339e24947ba (diff) | |
Fix build failures on Mac : suppress cruft that tripped gcc
| -rw-r--r-- | indra/newview/llpersontabview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsociallist.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpersontabview.cpp b/indra/newview/llpersontabview.cpp index 72a95d3f4c..fff72c7758 100644 --- a/indra/newview/llpersontabview.cpp +++ b/indra/newview/llpersontabview.cpp @@ -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); diff --git a/indra/newview/llsociallist.cpp b/indra/newview/llsociallist.cpp index bcf6d5a63c..9f827cf04f 100644 --- a/indra/newview/llsociallist.cpp +++ b/indra/newview/llsociallist.cpp @@ -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) |