diff options
| author | Richard Linden <none@none> | 2012-04-18 17:27:28 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-18 17:27:28 -0700 |
| commit | 05600db8968d05e816cd637e99d821961802cbc0 (patch) | |
| tree | f4b1d96f9de78ce2d434216cfa3f3d13dec6ad74 | |
| parent | 48e94f369f160d538f05a7cdfe6154220de11a73 (diff) | |
converted to unix line endings
| -rw-r--r-- | indra/newview/llhudobject.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llhudobject.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index 06b0c3c6c8..0960846510 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -232,11 +232,11 @@ 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
+#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; diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h index 6f8be41177..21cf5fe17c 100644 --- a/indra/newview/llhudobject.h +++ b/indra/newview/llhudobject.h @@ -94,9 +94,9 @@ 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
+#ifdef XXX_STINSON_CHUI_REWORK + LL_HUD_EFFECT_VOICE_VISUALIZER, // Ventrella +#endif // XXX_STINSON_CHUI_REWORK LL_HUD_NAME_TAG, LL_HUD_EFFECT_BLOB }; |