summaryrefslogtreecommitdiff
path: root/indra/newview/llhudeffecttrail.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llhudeffecttrail.cpp')
-rw-r--r--indra/newview/llhudeffecttrail.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llhudeffecttrail.cpp b/indra/newview/llhudeffecttrail.cpp
index 248ee8136e..da734d6104 100644
--- a/indra/newview/llhudeffecttrail.cpp
+++ b/indra/newview/llhudeffecttrail.cpp
@@ -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;