diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llhudeffecttrail.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'indra/newview/llhudeffecttrail.cpp')
| -rw-r--r-- | indra/newview/llhudeffecttrail.cpp | 10 |
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; |