diff options
| author | callum <none@none> | 2011-10-28 11:01:11 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-28 11:01:11 -0700 |
| commit | b94f45db81fa6a4625d58301a13f964996fa65bd (patch) | |
| tree | 1c9134e08ce22f4e122c48e3a746259a8f7ef470 /indra/newview/llhudeffectblob.cpp | |
| parent | d08d018323272866b189979d0e772d50cdece4b2 (diff) | |
| parent | f84a69a7e00f0eed49894e14336126849a9e7b29 (diff) | |
Merge with head
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); |