summaryrefslogtreecommitdiff
path: root/indra/newview/llhudeffectblob.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-02-10 12:06:01 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-02-10 12:06:01 -0500
commit4849173fd87ff9199a0fee86dc6a43afe3936e71 (patch)
tree7d765b6d9aeba3ba0388ac229a8f63aa7a4af607 /indra/newview/llhudeffectblob.cpp
parent028a05e79467e0c1fd7d63224fb447a964ab7a0b (diff)
parent58348bd862163261fb650d8afd50fd1dc5e2695a (diff)
Merge daggy fix in rev a05866ebfea2 (Linux lib wildcards)
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);