From 777eb9603a9d80eabace771aa32191bd7028f881 Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Mon, 9 Nov 2020 16:54:04 -0800
Subject: [PATCH] SL-14275: Replace enum with S32 to better match
reflection_detail
---
indra/newview/pipeline.cpp | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c12b0a61a3b..d765117ab0d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -134,16 +134,13 @@
#define MATERIALS_IN_REFLECTIONS 0
// NOTE: Keep in sync with indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
-enum EWaterReflectionMode
-{
- WATER_REFLECT_NONE_WATER_OPAQUE = -2,
- WATER_REFLECT_NONE_WATER_TRANSPARENT = -1,
- WATER_REFLECT_MINIMAL = 0,
- WATER_REFLECT_TERRAIN = 1,
- WATER_REFLECT_STATIC_OBJECTS = 2,
- WATER_REFLECT_AVATARS = 3,
- WATER_REFLECT_EVERYTHING = 4
-};
+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;
--
GitLab