Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llreflectionmapmanager.h b/indra/newview/llreflectionmapmanager.h
index 0719c28134..5daed7d1cf 100644
--- a/indra/newview/llreflectionmapmanager.h
+++ b/indra/newview/llreflectionmapmanager.h
@@ -110,6 +110,8 @@ public:
     // maintain reflection probes
     void update();
 
+    void refreshSettings();
+
     // add a probe for the given spatial group
     LLReflectionMap* addProbe(LLSpatialGroup* group = nullptr);
 
@@ -248,6 +250,12 @@ private:
 
     U32 mDynamicProbeCount;
 
+    // cached settings from gSavedSettings
+    S32 mRenderReflectionProbeDetail = -1;
+    S32 mRenderReflectionProbeLevel = 3;
+    U32 mRenderReflectionProbeCount = 256U;
+    S32 mRenderReflectionProbeDynamicAllocation = -1;
+
     // resolution of reflection probes
     U32 mProbeResolution = 128;