diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:41:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:41:30 -0400 |
| commit | ba2300b8aeff30a64d3f34b0cd5c49aa890e0639 (patch) | |
| tree | d7a7f4aa61d1b2bd28374e5c61f3d6730d450574 /indra/newview/lltracker.cpp | |
| parent | a8b5da9a70936923e650bd5c200276da49106784 (diff) | |
| parent | 18321756297bd9b04a4204abe4fbb0e3e8112186 (diff) | |
pull fix for STORM-211
Diffstat (limited to 'indra/newview/lltracker.cpp')
| -rw-r--r-- | indra/newview/lltracker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 8391c0f832..c3dd17def9 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -564,16 +564,16 @@ void LLTracker::renderBeacon(LLVector3d pos_global, std::string text; text = llformat( "%.0f m", to_vec.magVec()); - LLWString wstr; - wstr += utf8str_to_wstring(label); - wstr += '\n'; - wstr += utf8str_to_wstring(text); + std::string str; + str += label; + str += '\n'; + str += text; hud_textp->setFont(LLFontGL::getFontSansSerif()); hud_textp->setZCompare(FALSE); hud_textp->setColor(LLColor4(1.f, 1.f, 1.f, llmax(0.2f, llmin(1.f,(dist-FADE_DIST)/FADE_DIST)))); - hud_textp->setString(wstr); + hud_textp->setString(str); hud_textp->setVertAlignment(LLHUDText::ALIGN_VERT_CENTER); hud_textp->setPositionAgent(pos_agent); } |