diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-01-19 13:31:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-01-19 13:31:55 -0500 |
| commit | b22efa0730623ac02c28307eb837bd977c089916 (patch) | |
| tree | 117accf4826abb20532b827c2d01f0bdb1ee75bc /indra/newview/llviewerobject.cpp | |
| parent | 022a71d7ce261c5362fc6253e29d649432b58248 (diff) | |
correct merge problems
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 2 insertions, 2 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; |