diff options
Diffstat (limited to 'linden/indra/newview/lltracker.cpp')
-rw-r--r-- | linden/indra/newview/lltracker.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp index cf98c7a..654510d 100644 --- a/linden/indra/newview/lltracker.cpp +++ b/linden/indra/newview/lltracker.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -578,7 +579,7 @@ void LLTracker::renderBeacon(LLVector3d pos_global, | |||
578 | wstr += '\n'; | 579 | wstr += '\n'; |
579 | wstr += utf8str_to_wstring(text); | 580 | wstr += utf8str_to_wstring(text); |
580 | 581 | ||
581 | hud_textp->setFont(LLFontGL::sSansSerif); | 582 | hud_textp->setFont(LLFontGL::getFontSansSerif()); |
582 | hud_textp->setZCompare(FALSE); | 583 | hud_textp->setZCompare(FALSE); |
583 | hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST)))); | 584 | hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST)))); |
584 | 585 | ||