diff options
| author | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-15 09:52:11 +0100 |
| commit | ad033a4b35387a343f2204cda64ecb590888b60e (patch) | |
| tree | 6b2191d8e082bc84e28b2bbaa4dcea95cf68a797 /indra/newview/llglsandbox.cpp | |
| parent | 393c819477b268aa0a05ec0a006e1dba27d6e6c6 (diff) | |
| parent | 508686047d5e98934d5fefbb576e54f108df6fe3 (diff) | |
sync up to viewer-developer
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 aab88e9779..842911ecc0 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -48,6 +48,7 @@ #include "lltoolmgr.h" #include "llselectmgr.h" #include "llhudmanager.h" +#include "llhudtext.h" #include "llrendersphere.h" #include "llviewerobjectlist.h" #include "lltoolselectrect.h" @@ -872,7 +873,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; |