FIRE-15074: Render normal imposters properly and don't use weird (Don't tie visual mute to RenderAvatarMaxVisible)

Thu, 11 Dec 2014 16:29:01 +0100

author
Ansariel
date
Thu, 11 Dec 2014 16:29:01 +0100
changeset 43056
a795a0939ee7
parent 43055
5f1e2abf615c
child 43057
e2afb3144b16

FIRE-15074: Render normal imposters properly and don't use weird (Don't tie visual mute to RenderAvatarMaxVisible)

indra/newview/llvoavatar.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llvoavatar.cpp	Thu Dec 11 14:34:34 2014 +0100
     1.2 +++ b/indra/newview/llvoavatar.cpp	Thu Dec 11 16:29:01 2014 +0100
     1.3 @@ -3498,25 +3498,27 @@
     1.4  						(mVisualComplexity > max_cost && max_render_cost > 0);
     1.5  
     1.6  					// Could be part of the grand || collection above, but yanked out to make the logic visible
     1.7 -					if (!muted)
     1.8 -					{
     1.9 -						if (sMaxVisible > 0)
    1.10 -						{	// They are above the visibilty rank - mute them
    1.11 -							muted = (mVisibilityRank > sMaxVisible);
    1.12 -						}
    1.13 +					// <FS:Ansariel> FIRE-15074: Render normal imposters properly (Don't tie visual mute to RenderAvatarMaxVisible)
    1.14 +					//if (!muted)
    1.15 +					//{
    1.16 +					//	if (sMaxVisible > 0)
    1.17 +					//	{	// They are above the visibilty rank - mute them
    1.18 +					//		muted = (mVisibilityRank > sMaxVisible);
    1.19 +					//	}
    1.20  			
    1.21 -						// Always draw friends or those in IMs.  Needs UI?
    1.22 -						if ((render_auto_mute_functions & 0x02) &&
    1.23 -							(muted || sMaxVisible == 0))		// Don't mute friends or IMs							
    1.24 -						{
    1.25 -							muted = !(LLAvatarTracker::instance().isBuddy(getID()));
    1.26 -							if (muted)
    1.27 -							{	// Not a friend, so they are muted ... are they in an IM?
    1.28 -								LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,getID());
    1.29 -								muted = !gIMMgr->hasSession(session_id);
    1.30 -							}
    1.31 -						}
    1.32 -					}
    1.33 +					//	// Always draw friends or those in IMs.  Needs UI?
    1.34 +					//	if ((render_auto_mute_functions & 0x02) &&
    1.35 +					//		(muted || sMaxVisible == 0))		// Don't mute friends or IMs							
    1.36 +					//	{
    1.37 +					//		muted = !(LLAvatarTracker::instance().isBuddy(getID()));
    1.38 +					//		if (muted)
    1.39 +					//		{	// Not a friend, so they are muted ... are they in an IM?
    1.40 +					//			LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,getID());
    1.41 +					//			muted = !gIMMgr->hasSession(session_id);
    1.42 +					//		}
    1.43 +					//	}
    1.44 +					//}
    1.45 +					// </FS:Ansariel>
    1.46  
    1.47  					// Save visual mute state and set interval for updating
    1.48  					const F64 SECONDS_BETWEEN_RENDER_AUTO_MUTE_UPDATES = 1.5;

mercurial