summaryrefslogtreecommitdiff
path: root/indra/newview/llhudeffectblob.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-21 16:09:44 -0700
committerRichard Linden <none@none>2011-10-21 16:09:44 -0700
commit36b8a909c7aeec46e6c027f7fbe5d246867e19ec (patch)
tree81da64e15cd61bf18f4a7ff8039183a21ff7edba /indra/newview/llhudeffectblob.h
parent0297f55c6d4be505fe6831a593ed2630d565e14a (diff)
parent7b4c300081d7be1087f6f60f76b955947bdede65 (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.h')
-rw-r--r--indra/newview/llhudeffectblob.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llhudeffectblob.h b/indra/newview/llhudeffectblob.h
index f4c1691108..ce3e8500fc 100644
--- a/indra/newview/llhudeffectblob.h
+++ b/indra/newview/llhudeffectblob.h
@@ -35,6 +35,8 @@ class LLHUDEffectBlob : public LLHUDEffect
public:
friend class LLHUDObject;
+ void markDead();
+
void setPixelSize(S32 pixels) { mPixelSize = pixels; }
protected: