From b22efa0730623ac02c28307eb837bd977c089916 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
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