From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 2 Mar 2007 21:25:50 +0000 Subject: merge release@58699 beta-1-14-0@58707 -> release --- indra/newview/llhudeffecttrail.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'indra/newview/llhudeffecttrail.cpp') diff --git a/indra/newview/llhudeffecttrail.cpp b/indra/newview/llhudeffecttrail.cpp index d76250d10a..05da40f214 100644 --- a/indra/newview/llhudeffecttrail.cpp +++ b/indra/newview/llhudeffecttrail.cpp @@ -156,7 +156,7 @@ void LLHUDEffectSpiral::triggerLocal() mKillTime = mTimer.getElapsedTimeF32() + mDuration; BOOL show_beam = gSavedSettings.getBOOL("ShowSelectionBeam"); - + LLColor4 color; color.setVec(mColor); @@ -250,20 +250,12 @@ void LLHUDEffectSpiral::setTargetObject(LLViewerObject *objp) void LLHUDEffectSpiral::render() { - if (!mSourceObject.isNull() && mSourceObject->isDead()) - { - markDead(); - return; - } - - if(!mTargetObject.isNull() && mTargetObject->isDead()) - { - markDead(); - return; - } - F32 time = mTimer.getElapsedTimeF32(); - if (mKillTime < time) + + if (!mSourceObject.isNull() && mSourceObject->isDead() || + !mTargetObject.isNull() && mTargetObject->isDead() || + mKillTime < time || + !gSavedSettings.getBOOL("ShowSelectionBeam")) { markDead(); return; -- cgit v1.2.3