summaryrefslogtreecommitdiff
path: root/indra/newview/llhudeffectblob.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-27 14:52:17 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-27 14:52:17 -0400
commit1e70d53b198e15a85138a8f0ebdf6f77f070f916 (patch)
tree49d58bf6cd6584834b6e91688ad8bfb34bd38cff /indra/newview/llhudeffectblob.cpp
parent0c84957d312bc3dc31fdb5711317157df73b72e6 (diff)
parent1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff)
merge
Diffstat (limited to 'indra/newview/llhudeffectblob.cpp')
-rw-r--r--indra/newview/llhudeffectblob.cpp8
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);