Second Life viewer sources 1.19.1.0

1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index 85b103f..ce5905d 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -84,7 +84,7 @@ void LLHUDEffectSpiral::markDead()
                 mPartSourcep->setDead();
                 mPartSourcep = NULL;
         }
-        LLHUDObject::markDead();
+        LLHUDEffect::markDead();
 }
 
 void LLHUDEffectSpiral::packData(LLMessageSystem *mesgsys)
@@ -250,7 +250,7 @@ void LLHUDEffectSpiral::triggerLocal()
                         psb->setColor(color);
                         if (mTargetObject.isNull())
                         {
-                                psb->mLKGTargetPosGlobal = mPositionGlobal;                             
+                                psb->mLKGTargetPosGlobal = mPositionGlobal;
                         }
                 }
                 else
@@ -277,10 +277,10 @@ void LLHUDEffectSpiral::render()
 {
         F32 time = mTimer.getElapsedTimeF32();
 
-        if (!mSourceObject.isNull() && mSourceObject->isDead() ||
-                !mTargetObject.isNull() && mTargetObject->isDead() ||
-                mKillTime < time ||
-                !gSavedSettings.getBOOL("ShowSelectionBeam"))
+        if ((!mSourceObject.isNull() && mSourceObject->isDead()) ||
+            (!mTargetObject.isNull() && mTargetObject->isDead()) ||
+            mKillTime < time ||
+                (!mPartSourcep.isNull() && !gSavedSettings.getBOOL("ShowSelectionBeam")) )
         {
                 markDead();
                 return;