diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d79c84bee32b5dae6469bf94e5396b6af33b6dbc..2c111643ce2472a0e1c5782a853350032712c390 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; diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 52965469b3354d50cd984f99ecea6c99d63e9d4f..cb8acfdcf82dd9ca0fadd4889a88c329c4aec8db 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -403,7 +403,6 @@ class LLViewerObject void setCanSelect(BOOL canSelect); - void initDebugTextHud(); void setDebugText(const std::string &utf8text); void initHudText(); void restoreHudText(); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index c31195cc91326fc260a8a8c13b448affbc691726..2e8d8602f97021094551fa0503d854ca2310f8fd 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8224,7 +8224,7 @@ void LLVOAvatar::idleUpdateRenderComplexity() if ( !mText ) { - initDebugTextHud(); + initHudText(); mText->setFadeDistance(20.0, 5.0); // limit clutter in large crowds } else