diff options
| author | Richard Linden <none@none> | 2011-10-21 16:09:44 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-21 16:09:44 -0700 |
| commit | 36b8a909c7aeec46e6c027f7fbe5d246867e19ec (patch) | |
| tree | 81da64e15cd61bf18f4a7ff8039183a21ff7edba /indra/newview/llhudeffectblob.cpp | |
| parent | 0297f55c6d4be505fe6831a593ed2630d565e14a (diff) | |
| parent | 7b4c300081d7be1087f6f60f76b955947bdede65 (diff) | |
Automated merge with bundle:c:\users\richard\appdata\local\temp\thg.qp3yns\ssh__richard@hg.lindenlab.com_sergeylproductengine_exp-1416__5pjppa.hg
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); |