diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2020-11-11 13:38:19 -0800 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2020-11-11 14:32:39 -0800 |
| commit | f9a09406b38ad62e1db5914a96e462002c80fce9 (patch) | |
| tree | ce9e093504943f5f98d60733eb04b537e657ec06 /indra | |
| parent | 5ddd3a025e9624335577928e48d1081168939b0d (diff) | |
SL-14275: Comment out unused global consts for compilers that treat this an an error
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/pipeline.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 623a109d2d..c09c593c4a 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -130,13 +130,14 @@ #define MATERIALS_IN_REFLECTIONS 0 // NOTE: Keep in sync with indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml -const S32 WATER_REFLECT_NONE_WATER_OPAQUE = -2; -const S32 WATER_REFLECT_NONE_WATER_TRANSPARENT = -1; -const S32 WATER_REFLECT_MINIMAL = 0; -const S32 WATER_REFLECT_TERRAIN = 1; -const S32 WATER_REFLECT_STATIC_OBJECTS = 2; -const S32 WATER_REFLECT_AVATARS = 3; -const S32 WATER_REFLECT_EVERYTHING = 4; +// NOTE: Unused consts are commented out since some compilers (on macOS) may complain about unused variables. +// const S32 WATER_REFLECT_NONE_WATER_OPAQUE = -2; + const S32 WATER_REFLECT_NONE_WATER_TRANSPARENT = -1; + const S32 WATER_REFLECT_MINIMAL = 0; +// const S32 WATER_REFLECT_TERRAIN = 1; + const S32 WATER_REFLECT_STATIC_OBJECTS = 2; + const S32 WATER_REFLECT_AVATARS = 3; + const S32 WATER_REFLECT_EVERYTHING = 4; bool gShiftFrame = false; |