diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
| commit | 42e397e155239932a75fa694dc77d9dd952e3c09 (patch) | |
| tree | 1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/newview/lltracker.cpp | |
| parent | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff) | |
| parent | c683151587067cb2758206432610d4ff4884036e (diff) | |
Merged from 2.3.0-beta1 tag in viewer-development
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); } |