diff options
| author | James Cook <james@lindenlab.com> | 2010-02-25 17:06:17 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-25 17:06:17 -0800 |
| commit | 36c35bca2663447216027015c10aa921ab75abfb (patch) | |
| tree | c716404bf813a4635fef60a7419a3961c6de10b4 /indra/newview/llglsandbox.cpp | |
| parent | 3eec41f6716940ffcfd4bf239e1e493c2d0a0658 (diff) | |
Support multiple fonts, colors and styles in name tags
Simplified LLHUDText string API to be UTF8 only
Added per-text segment font support
Changed LLVOAvatar invalidateNameTag to clearNameTag
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
| -rw-r--r-- | indra/newview/llglsandbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 750a9d478f..134e63fa35 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -983,7 +983,7 @@ void LLViewerObjectList::renderObjectBeacons() color = debug_beacon.mTextColor; color.mV[3] *= 1.f; - hud_textp->setString(utf8str_to_wstring(debug_beacon.mString)); + hud_textp->setString(debug_beacon.mString); hud_textp->setColor(color); hud_textp->setPositionAgent(debug_beacon.mPositionAgent); debug_beacon.mHUDObject = hud_textp; |