SL-19538 Clear probes on sky setting slam. Better probe update prioritization. Incidental decruft.

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llreflectionmapmanager.h b/indra/newview/llreflectionmapmanager.h
index 9a46af58b3..066b1e380f 100644
--- a/indra/newview/llreflectionmapmanager.h
+++ b/indra/newview/llreflectionmapmanager.h
@@ -80,8 +80,8 @@ public:
     // Guaranteed to not return null
     LLReflectionMap* registerViewerObject(LLViewerObject* vobj);
 
-    // force an update of all probes
-    void rebuild();
+    // reset all state on the next update
+    void reset();
 
     // called on region crossing to "shift" probes into new coordinate frame
     void shift(const LLVector4a& offset);
@@ -190,5 +190,8 @@ private:
 
     // amount to scale local lights during an irradiance map update (set during updateProbeFace and used by LLPipeline)
     F32 mLightScale = 1.f;
+
+    // if true, reset all probe render state on the next update (for teleports and sky changes)
+    bool mReset = false;
 };