diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-15 12:14:34 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-15 12:14:34 -0600 |
| commit | d9512674678bbb80b8d0d9c5105f56dbd1b2252b (patch) | |
| tree | c3c8d64c683cd46d9d1e5d953dc6caca22213db4 /indra/newview/llhudobject.cpp | |
| parent | d31e6735370711088f01cff448aa22f71c4c10c4 (diff) | |
| parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) | |
Merge from viewer-development
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; } |