From 022a71d7ce261c5362fc6253e29d649432b58248 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 16 Jan 2016 10:27:12 -0500 Subject: attempted fix for hud text merge --- indra/newview/llviewerobject.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'indra') 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) -- cgit v1.2.3