summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewerobject.cpp4
-rwxr-xr-xindra/newview/llviewerobject.h1
-rwxr-xr-xindra/newview/llvoavatar.cpp2
3 files changed, 3 insertions, 4 deletions
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;
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 52965469b3..cb8acfdcf8 100755
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -403,7 +403,6 @@ public:
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 c31195cc91..2e8d8602f9 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