From c27f2e19125c469bd0cbddd8c2a8feac66dc8b9a Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 23 Feb 2016 12:08:29 +0200 Subject: MAINT-6110 Show hovertext on attached objects --- indra/newview/llhudtext.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index c87e2fb658..05c8c236e9 100755 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -384,11 +384,21 @@ void LLHUDText::updateVisibility() mPositionAgent -= dir_from_camera * mSourceObject->getVObjRadius(); } - mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec(); + if (!mTextSegments.size()) + { + mVisible = FALSE; + return; + } + mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec(); F32 obj_dist = dist_vec(mSourceObject->getPositionEdit(), LLViewerCamera::getInstance()->getOrigin()); - if (!mTextSegments.size() || (mDoFade && (mLastDistance > mFadeDistance + mFadeRange)) || (obj_dist > MAX_DRAW_DISTANCE)) + if(mSourceObject->isAttachment()) + { + LLViewerObject* parent = (LLViewerObject*)mSourceObject->getRoot(); + obj_dist = dist_vec(parent->getPositionEdit(), LLViewerCamera::getInstance()->getOrigin()); + } + if ((mDoFade && (mLastDistance > mFadeDistance + mFadeRange)) || (obj_dist > MAX_DRAW_DISTANCE)) { mVisible = FALSE; return; -- cgit v1.2.3