summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-11-17 11:27:24 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-11-17 11:27:24 +0200
commitc4a3eb3c421efafba64cef4beff9cab50a3d307e (patch)
tree278f79b976735c43ab68eb6aa40a9b30683cce09 /indra/newview
parent2999933e4e0a7f48b697c05062543ba0e342c81e (diff)
MAINT-5837 FIXED Hovering text is displayed when the avatar is blocked
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerobject.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 92a5b02a07..d79c84bee3 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5043,7 +5043,13 @@ void LLViewerObject::updateText()
{
if (mText.notNull())
{
- LLVector3 up_offset(0,0,0);
+ LLVOAvatar* avatar = getAvatar();
+ if (avatar)
+ {
+ mText->setHidden(avatar->isInMuteList());
+ }
+
+ LLVector3 up_offset(0,0,0);
up_offset.mV[2] = getScale().mV[VZ]*0.6f;
if (mDrawable.notNull())