Merge LL Viewer 4.0.2

Thu, 17 Mar 2016 19:41:04 +0100

author
Ansariel
date
Thu, 17 Mar 2016 19:41:04 +0100
changeset 48922
53d35af4c234
parent 48917
8af8a10da752
parent 48921
de0787904b53
child 48923
bdb4b13c94ff

Merge LL Viewer 4.0.2

.hgtags file | annotate | diff | revisions
indra/newview/VIEWER_VERSION.txt file | annotate | diff | revisions
indra/newview/llhudtext.cpp file | annotate | diff | revisions
     1.1 --- a/.hgtags	Tue Mar 08 09:08:56 2016 +0100
     1.2 +++ b/.hgtags	Thu Mar 17 19:41:04 2016 +0100
     1.3 @@ -545,3 +545,4 @@
     1.4  5a5bd148943bfb46cf2ff2ccf376c42dee93d19b 3.8.6-release
     1.5  ae3297cdd03ab14f19f3811acbc4acd3eb600336 4.0.0-release
     1.6  759710a9acef61aaf7b69f4bc4a5a913de87ad8a 4.0.1-release
     1.7 +e9d350764dfbf5a46229e627547ef5c1b1eeef00 4.0.2-release
     2.1 --- a/indra/newview/llhudtext.cpp	Tue Mar 08 09:08:56 2016 +0100
     2.2 +++ b/indra/newview/llhudtext.cpp	Thu Mar 17 19:41:04 2016 +0100
     2.3 @@ -413,7 +413,7 @@
     2.4  		mVisible = FALSE;
     2.5  		return;
     2.6  	}
     2.7 -		
     2.8 +
     2.9  	if (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis() <= LLViewerCamera::getInstance()->getNear() + 0.1f + mSourceObject->getVObjRadius())
    2.10  	{
    2.11  		mPositionAgent = LLViewerCamera::getInstance()->getOrigin() + vec_from_camera * ((LLViewerCamera::getInstance()->getNear() + 0.1f) / (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis()));
    2.12 @@ -423,21 +423,17 @@
    2.13  		mPositionAgent -= dir_from_camera * mSourceObject->getVObjRadius();
    2.14  	}
    2.15  
    2.16 -	if (!mTextSegments.size())
    2.17 +	mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();
    2.18 +
    2.19 +	if (!mTextSegments.size() || (mDoFade && (mLastDistance > mFadeDistance + mFadeRange)))
    2.20  	{
    2.21  		mVisible = FALSE;
    2.22  		return;
    2.23  	}
    2.24  
    2.25 -	mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();
    2.26 -	F32 obj_dist = dist_vec(mSourceObject->getPositionEdit(), LLViewerCamera::getInstance()->getOrigin());
    2.27 -
    2.28 -	if(mSourceObject->isAttachment())
    2.29 -	{
    2.30 -		LLViewerObject* parent = (LLViewerObject*)mSourceObject->getRoot();
    2.31 -		obj_dist = dist_vec(parent->getPositionEdit(), LLViewerCamera::getInstance()->getOrigin());
    2.32 -	}
    2.33 -	if ((mDoFade && (mLastDistance > mFadeDistance + mFadeRange)) || (obj_dist > MAX_DRAW_DISTANCE))
    2.34 +	LLVector3 pos_agent_center = gAgent.getPosAgentFromGlobal(mPositionGlobal) - dir_from_camera;
    2.35 +	F32 last_distance_center = (pos_agent_center - LLViewerCamera::getInstance()->getOrigin()).magVec();
    2.36 +	if(last_distance_center > MAX_DRAW_DISTANCE)
    2.37  	{
    2.38  		mVisible = FALSE;
    2.39  		return;

mercurial