summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-01-16 10:27:12 -0500
committerOz Linden <oz@lindenlab.com>2016-01-16 10:27:12 -0500
commit022a71d7ce261c5362fc6253e29d649432b58248 (patch)
tree030d9dd6efbc324cba9840cbc973128d5a4bc043 /indra/newview
parent9848fc42534e48d20cf6d6732aae1c8233580792 (diff)
attempted fix for hud text merge
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerobject.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 686af4afa7..d79c84bee3 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4992,16 +4992,9 @@ void LLViewerObject::restoreHudText()
{
if(mText)
{
-}
-
-void LLViewerObject::initDebugTextHud()
-{
- mText = (LLHUDText *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
- mText->setFont(LLFontGL::getFontSansSerif());
- mText->setVertAlignment(LLHUDText::ALIGN_VERT_TOP);
- mText->setMaxLines(-1);
- mText->setSourceObject(this);
- mText->setOnHUDAttachment(isHUDAttachment());
+ mText->setColor(mHudTextColor);
+ mText->setString(mHudText);
+ }
}
void LLViewerObject::setIcon(LLViewerTexture* icon_image)