diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-11-18 10:45:40 -0500 |
| commit | 3819c3b049abb0771c7129c0a11a8fcd0725f9fd (patch) | |
| tree | f0bb1432b1ae475c7d844f278b668e1d76193e96 /indra/newview/llhudeffectblob.cpp | |
| parent | 620b63a31667d93d9186217eb355d05e71ff245c (diff) | |
| parent | 4bcdcd02fb7e83a2754084f2fb599b56ea6c8743 (diff) | |
Merge
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); |