From 4c068a4a857ed702cf230fb6418d17172436e3dd Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 18 Apr 2011 01:44:13 -0500 Subject: [PATCH] Clamping prim settext max visible range to that of a 15^3 prim, because certain 'people' abuse megaprims to make annoying hovertext spam. --- indra/newview/llhudtext.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index c64da4bce..0d4bca83d 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -809,13 +809,14 @@ void LLHUDText::updateVisibility() return; } - if (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis() <= LLViewerCamera::getInstance()->getNear() + 0.1f + mSourceObject->getVObjRadius()) + F32 object_radius = llmin(mSourceObject->getVObjRadius(), 26.f); //~15x15x15 prim : sqrt((15^2) * 3) = 25.9807621. getVObjRadius is diam. + if (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis() <= LLViewerCamera::getInstance()->getNear() + 0.1f + object_radius) { mPositionAgent = LLViewerCamera::getInstance()->getOrigin() + vec_from_camera * ((LLViewerCamera::getInstance()->getNear() + 0.1f) / (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis())); } else { - mPositionAgent -= dir_from_camera * mSourceObject->getVObjRadius(); + mPositionAgent -= dir_from_camera * object_radius; } mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();