diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
| commit | 76876538715e3afbe456e2bf84173bde416d50e6 (patch) | |
| tree | 423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/newview/llglsandbox.cpp | |
| parent | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff) | |
| parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) | |
Automated merge up from viewer-development
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 83846f5b61..d43b3a5d6e 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" @@ -888,7 +889,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; |