diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:39:31 -0400 |
| commit | 60bceb759b592348b403689ffa8ed9c768126f8b (patch) | |
| tree | 33b0ece80cc12f390683d89c30f2a706fa87bd50 /indra/newview/llhudobject.cpp | |
| parent | c9c192e2c476e73807d23cdda0814cb221a96b95 (diff) | |
| parent | e2baffa940a5797f2055f13ceb9722de524b2ec3 (diff) | |
merge changes for storm-954
Diffstat (limited to 'indra/newview/llhudobject.cpp')
| -rw-r--r-- | indra/newview/llhudobject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index 5e762ee037..95d57d08d8 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -32,6 +32,7 @@ #include "llhudtext.h" #include "llhudicon.h" #include "llhudeffectbeam.h" +#include "llhudeffectblob.h" #include "llhudeffecttrail.h" #include "llhudeffectlookat.h" #include "llhudeffectpointat.h" @@ -237,6 +238,9 @@ LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type) case LL_HUD_EFFECT_POINTAT: hud_objectp = new LLHUDEffectPointAt(type); break; + case LL_HUD_EFFECT_BLOB: + hud_objectp = new LLHUDEffectBlob(type); + break; default: llwarns << "Unknown type of hud effect:" << (U32) type << llendl; } |