diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-03 13:55:34 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-03 13:55:34 -0700 |
| commit | c66164d4b469a4154134dc1a6b21f491ed8c31e6 (patch) | |
| tree | 3a61f234388517872c5cde1a58b64871d15fcb4e /indra/newview/llhudobject.h | |
| parent | d6d35d970f3a7b4db7e29f7d2eddb0c078cba4a5 (diff) | |
| parent | 291e78732374f428e43bb6bf5967ed3a114d0f18 (diff) | |
Pull merge from richard/viewer-chui.
Diffstat (limited to 'indra/newview/llhudobject.h')
| -rw-r--r-- | indra/newview/llhudobject.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h index 21cf5fe17c..32cffe6839 100644 --- a/indra/newview/llhudobject.h +++ b/indra/newview/llhudobject.h @@ -39,6 +39,8 @@ #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; |