diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/llgroupnotify.cpp | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llgroupnotify.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp index 8e98cbc..81e6c21 100644 --- a/linden/indra/newview/llgroupnotify.cpp +++ b/linden/indra/newview/llgroupnotify.cpp | |||
| @@ -186,7 +186,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject, | |||
| 186 | LLFontGL::getFontSansSerif(), | 186 | LLFontGL::getFontSansSerif(), |
| 187 | FALSE); | 187 | FALSE); |
| 188 | 188 | ||
| 189 | static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifBig")); | 189 | static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifLarge")); |
| 190 | static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif")); | 190 | static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif")); |
| 191 | 191 | ||
| 192 | text->appendStyledText(subject + "\n",false,false,headerstyle); | 192 | text->appendStyledText(subject + "\n",false,false,headerstyle); |