diff options
| author | Richard Linden <none@none> | 2011-10-21 15:04:01 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-21 15:04:01 -0700 |
| commit | aaabea2ced46015385a2528d0ca24e8d2a96da55 (patch) | |
| tree | 2f4e2cd47807a99f09ef3651193e9dfb038de1f9 /indra/newview/llhudeffectblob.cpp | |
| parent | 2456573925567ed91d4cc227d7fc97b90248a1fa (diff) | |
| parent | f2952ded0396e98e1010ebe39de5bba0ae6ba5f7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/paulgproductengine/exp-1404/
Diffstat (limited to 'indra/newview/llhudeffectblob.cpp')
| -rw-r--r-- | indra/newview/llhudeffectblob.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llhudeffectblob.cpp b/indra/newview/llhudeffectblob.cpp index d8687eed8d..c909551b51 100644 --- a/indra/newview/llhudeffectblob.cpp +++ b/indra/newview/llhudeffectblob.cpp @@ -44,12 +44,20 @@ LLHUDEffectBlob::~LLHUDEffectBlob() { } +void LLHUDEffectBlob::markDead() +{ + mImage = NULL; + + LLHUDEffect::markDead(); +} + void LLHUDEffectBlob::render() { F32 time = mTimer.getElapsedTimeF32(); if (mDuration < time) { markDead(); + return; } LLVector3 pos_agent = gAgent.getPosAgentFromGlobal(mPositionGlobal); |