summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2016-02-05 11:32:48 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2016-02-05 11:32:48 +0200
commit031631d6615a54d465d8ccf7b81298b4564de740 (patch)
treea59450bf89a282dce72429346f5f15fc13691a2e /indra/newview
parentd2119685a0bea0335d86f54aa0f9e62de84a20af (diff)
MAINT-6110 FIXED No hovertext (PRIM_TEXT/llSetText) on child prims
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llhudtext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 3ab89b6e5f..c87e2fb658 100755
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -385,13 +385,16 @@ void LLHUDText::updateVisibility()
}
mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();
- F32 obj_dist = dist_vec(mSourceObject->getPosition(), LLViewerCamera::getInstance()->getOrigin());
+
+ F32 obj_dist = dist_vec(mSourceObject->getPositionEdit(), LLViewerCamera::getInstance()->getOrigin());
+
if (!mTextSegments.size() || (mDoFade && (mLastDistance > mFadeDistance + mFadeRange)) || (obj_dist > MAX_DRAW_DISTANCE))
{
mVisible = FALSE;
return;
}
+
LLVector3 x_pixel_vec;
LLVector3 y_pixel_vec;