diff options
author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
---|---|---|
committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llhudobject.cpp | |
parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
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 1c8c45a078..0bcbbbb140 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -22,6 +22,7 @@ #include "llhudeffectlookat.h" //Ventrella +#include "llvoicevisualizer.h" #include "llanimalcontrols.h" #include "lllocalanimationobject.h" #include "llcape.h" @@ -205,6 +206,9 @@ LLHUDObject *LLHUDObject::addHUDObject(const U8 type) case LL_HUD_EFFECT_LOOKAT: hud_objectp = new LLHUDEffectLookAt(type); break; + case LL_HUD_EFFECT_VOICE_VISUALIZER: + hud_objectp = new LLVoiceVisualizer(type); + break; case LL_HUD_EFFECT_POINTAT: hud_objectp = new LLHUDEffectPointAt(type); break; |