diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 16:19:48 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-17 16:19:48 -0800 |
| commit | e7467e8c01ef43ea14a3da9de436e9aa3dd02606 (patch) | |
| tree | 06ff928a0c1949ed8563178cc11ea108f212be60 /indra/newview/llhudobject.cpp | |
| parent | 09163617c2c5e79d8e51b5ceca5b5282effcb1f6 (diff) | |
| parent | 138d4f5fcd4567c5d77230b6eadc21c246ceed59 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-chui-stinson-alt.
Diffstat (limited to 'indra/newview/llhudobject.cpp')
| -rw-r--r-- | indra/newview/llhudobject.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index 0960846510..95d57d08d8 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -232,11 +232,9 @@ LLHUDEffect *LLHUDObject::addHUDEffect(const U8 type) case LL_HUD_EFFECT_LOOKAT: hud_objectp = new LLHUDEffectLookAt(type); break; -#ifdef XXX_STINSON_CHUI_REWORK case LL_HUD_EFFECT_VOICE_VISUALIZER: hud_objectp = new LLVoiceVisualizer(type); break; -#endif // XXX_STINSON_CHUI_REWORK case LL_HUD_EFFECT_POINTAT: hud_objectp = new LLHUDEffectPointAt(type); break; |