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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/llhudobject.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h index 32cffe6839..2f7a98c86c 100644 --- a/indra/newview/llhudobject.h +++ b/indra/newview/llhudobject.h @@ -39,8 +39,6 @@ #include "lldrawpool.h" // TODO: eliminate, unused below #include <list> -#define XXX_STINSON_CHUI_REWORK // temporarily re-enabling the in-world voice-dot - class LLViewerCamera; class LLFontGL; class LLFace; @@ -96,9 +94,7 @@ public: LL_HUD_EFFECT_EDIT, LL_HUD_EFFECT_LOOKAT, LL_HUD_EFFECT_POINTAT, -#ifdef XXX_STINSON_CHUI_REWORK LL_HUD_EFFECT_VOICE_VISUALIZER, // Ventrella -#endif // XXX_STINSON_CHUI_REWORK LL_HUD_NAME_TAG, LL_HUD_EFFECT_BLOB }; |