1 files changed, 6 insertions, 14 deletions

diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index ac7f22f..cf76357 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -175,7 +175,7 @@ void LLHUDEffectSpiral::triggerLocal()
         mKillTime = mTimer.getElapsedTimeF32() + mDuration;
 
         BOOL show_beam = gSavedSettings.getBOOL("ShowSelectionBeam");
-        
+
         LLColor4 color;
         color.setVec(mColor);
 
@@ -269,20 +269,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;