diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:41:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:41:30 -0400 |
| commit | ba2300b8aeff30a64d3f34b0cd5c49aa890e0639 (patch) | |
| tree | d7a7f4aa61d1b2bd28374e5c61f3d6730d450574 /indra/newview/llglsandbox.cpp | |
| parent | a8b5da9a70936923e650bd5c200276da49106784 (diff) | |
| parent | 18321756297bd9b04a4204abe4fbb0e3e8112186 (diff) | |
pull fix for STORM-211
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; |