diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-04 10:41:31 -0400 | 
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-04-04 10:41:31 -0400 | 
| commit | 67353ef0c24f62c5e2356ccc1aaa55fb556379f5 (patch) | |
| tree | 1e67b92641444966ba8d25373cf01ebeccbf020f /indra/newview | |
| parent | 96d96bf4746210095cc40bd37b46b005daf7a0f3 (diff) | |
formatting fixes (whitespace only)
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 82 | 
1 files changed, 41 insertions, 41 deletions
| diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 2f26c4583c..58cabd1a24 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3067,43 +3067,43 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)  		return;  	} -		BOOL new_name = FALSE; -		if (visible_chat != mVisibleChat) +	BOOL new_name = FALSE; +	if (visible_chat != mVisibleChat) +	{ +		mVisibleChat = visible_chat; +		new_name = TRUE; +	} +		 +	if (sRenderGroupTitles != mRenderGroupTitles) +	{ +		mRenderGroupTitles = sRenderGroupTitles; +		new_name = TRUE; +	} + +	// First Calculate Alpha +	// If alpha > 0, create mNameText if necessary, otherwise delete it +	F32 alpha = 0.f; +	if (mAppAngle > 5.f) +	{ +		const F32 START_FADE_TIME = NAME_SHOW_TIME - FADE_DURATION; +		if (!visible_chat && sRenderName == RENDER_NAME_FADE && time_visible > START_FADE_TIME)  		{ -			mVisibleChat = visible_chat; -			new_name = TRUE; +			alpha = 1.f - (time_visible - START_FADE_TIME) / FADE_DURATION;  		} -		 -		if (sRenderGroupTitles != mRenderGroupTitles) +		else  		{ -			mRenderGroupTitles = sRenderGroupTitles; -			new_name = TRUE; +			// ...not fading, full alpha +			alpha = 1.f;  		} - -		// First Calculate Alpha -		// If alpha > 0, create mNameText if necessary, otherwise delete it -			F32 alpha = 0.f; -			if (mAppAngle > 5.f) -			{ -				const F32 START_FADE_TIME = NAME_SHOW_TIME - FADE_DURATION; -				if (!visible_chat && sRenderName == RENDER_NAME_FADE && time_visible > START_FADE_TIME) -				{ -					alpha = 1.f - (time_visible - START_FADE_TIME) / FADE_DURATION; -				} -				else -				{ -					// ...not fading, full alpha -					alpha = 1.f; -				} -			} -			else if (mAppAngle > 2.f) -			{ -				// far away is faded out also -				alpha = (mAppAngle-2.f)/3.f; -			} +	} +	else if (mAppAngle > 2.f) +	{ +		// far away is faded out also +		alpha = (mAppAngle-2.f)/3.f; +	}  	if (alpha <= 0.f) -			{ +	{  		if (mNameText)  		{  			mNameText->markDead(); @@ -3113,19 +3113,19 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)  		return;  	} -				if (!mNameText) -				{ +	if (!mNameText) +	{  		mNameText = static_cast<LLHUDNameTag*>( LLHUDObject::addHUDObject( -			LLHUDObject::LL_HUD_NAME_TAG) ); +													LLHUDObject::LL_HUD_NAME_TAG) );  		//mNameText->setMass(10.f); -					mNameText->setSourceObject(this); +		mNameText->setSourceObject(this);  		mNameText->setVertAlignment(LLHUDNameTag::ALIGN_VERT_TOP); -					mNameText->setVisibleOffScreen(TRUE); -					mNameText->setMaxLines(11); -					mNameText->setFadeDistance(CHAT_NORMAL_RADIUS, 5.f); -					sNumVisibleChatBubbles++; -					new_name = TRUE; -				} +		mNameText->setVisibleOffScreen(TRUE); +		mNameText->setMaxLines(11); +		mNameText->setFadeDistance(CHAT_NORMAL_RADIUS, 5.f); +		sNumVisibleChatBubbles++; +		new_name = TRUE; +	}  	LLVector3 name_position = idleUpdateNameTagPosition(root_pos_last);  	mNameText->setPositionAgent(name_position);				 | 
