From c71cf9cf23ff7a9928695367e9b62db3bed38ed7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 1 Dec 2014 13:45:48 -0500 Subject: Improve display of avatar rendering info, remove last use of RenderAutoMuteFunctions --- indra/newview/llviewerobject.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 4f992fc184..2f6283c8d0 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4926,12 +4926,7 @@ void LLViewerObject::setDebugText(const std::string &utf8text) if (!mText) { - 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()); + initDebugTextHud(); } mText->setColor(LLColor4::white); mText->setString(utf8text); @@ -4940,6 +4935,16 @@ void LLViewerObject::setDebugText(const std::string &utf8text) updateText(); } +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()); +} + void LLViewerObject::setIcon(LLViewerTexture* icon_image) { if (!mIcon) -- cgit v1.2.3 From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/newview/llviewerobject.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/newview/llviewerobject.cpp (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp old mode 100755 new mode 100644 -- cgit v1.2.3 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/newview/llviewerobject.cpp') 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 From b22efa0730623ac02c28307eb837bd977c089916 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 19 Jan 2016 13:31:55 -0500 Subject: correct merge problems --- indra/newview/llviewerobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d79c84bee3..2c111643ce 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5046,9 +5046,9 @@ void LLViewerObject::updateText() LLVOAvatar* avatar = getAvatar(); if (avatar) { - mText->setHidden(avatar->isInMuteList()); + mText->setHidden(LLMuteList::getInstance()->isMuted(avatar->getID())); } - + LLVector3 up_offset(0,0,0); up_offset.mV[2] = getScale().mV[VZ]*0.6f; -- cgit v1.2.3 From d7d4ffb0c4fda4e765a54115945a34eda28f9d1c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 19 Feb 2016 22:29:27 +0100 Subject: Restore cached mute check for improved performance --- indra/newview/llviewerobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 2c111643ce..05d0d56832 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5046,7 +5046,7 @@ void LLViewerObject::updateText() LLVOAvatar* avatar = getAvatar(); if (avatar) { - mText->setHidden(LLMuteList::getInstance()->isMuted(avatar->getID())); + mText->setHidden(avatar->isInMuteList()); } LLVector3 up_offset(0,0,0); -- cgit v1.2.3