diff options
| author | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-05-24 16:37:52 -0700 |
| commit | 2920d4c46f99c8c5bc8942a08a87fa204c57464b (patch) | |
| tree | 515837435a28924b028815fc79f7f4f2ec18871e /indra/newview/llglsandbox.cpp | |
| parent | a146a0f27b3ea2fadaa9e7286645a0944996309d (diff) | |
| parent | d674d11f895b8f3d578cded931cdc1c430379c95 (diff) | |
merge
Diffstat (limited to 'indra/newview/llglsandbox.cpp')
| -rw-r--r-- | indra/newview/llglsandbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index 2aba0b5c09..eec08301a8 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -54,6 +54,7 @@ #include "lltoolmgr.h" #include "llselectmgr.h" #include "llhudmanager.h" +#include "llhudtext.h" #include "llrendersphere.h" #include "llviewerobjectlist.h" #include "lltoolselectrect.h" @@ -894,7 +895,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; |