Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/newview/llheroprobemanager.h b/indra/newview/llheroprobemanager.h
index e45b0049b2..c8d505f4c3 100644
--- a/indra/newview/llheroprobemanager.h
+++ b/indra/newview/llheroprobemanager.h
@@ -51,18 +51,18 @@ class alignas(16) LLHeroProbeManager
 {
     LL_ALIGN_NEW
 public:
-    enum class DetailLevel 
+    enum class DetailLevel
     {
         STATIC_ONLY = 0,
         STATIC_AND_DYNAMIC,
         REALTIME = 2
     };
 
-    // allocate an environment map of the given resolution 
+    // allocate an environment map of the given resolution
     LLHeroProbeManager();
     ~LLHeroProbeManager();
 
-    // release any GL state 
+    // release any GL state
     void cleanup();
 
     // maintain reflection probes
@@ -90,11 +90,11 @@ public:
     LLVector3 mMirrorPosition;
     LLVector3     mMirrorNormal;
     HeroProbeData mHeroData;
-    
+
 private:
     friend class LLPipeline;
     friend class LLReflectionMapManager;
-    
+
     // update UBO used for rendering (call only once per render pipe flush)
     void updateUniforms();
 
@@ -103,7 +103,7 @@ private:
     // render target for cube snapshots
     // used to generate mipmaps without doing a copy-to-texture
     LLRenderTarget mRenderTarget;
-    
+
     LLRenderTarget mHeroRenderTarget;
 
     std::vector<LLRenderTarget> mMipChain;
@@ -120,7 +120,7 @@ private:
     // update the specified face of the specified probe
     void updateProbeFace(LLReflectionMap* probe, U32 face, bool is_dynamic, F32 near_clip);
     void generateRadiance(LLReflectionMap *probe);
-    
+
     // list of active reflection maps
     std::vector<LLPointer<LLReflectionMap>> mProbes;
 
@@ -136,10 +136,10 @@ private:
 
     // resolution of reflection probes
     U32 mProbeResolution = 1024;
-    
+
     // maximum LoD of reflection probes (mip levels - 1)
     F32 mMaxProbeLOD = 6.f;
-    
+
     F32 mHeroProbeStrength = 1.f;
     bool mIsInTransition = false;
 
@@ -148,9 +148,9 @@ private:
 
     bool mRenderingMirror = false;
     std::map<int, int> mFaceUpdateList;
-    
+
     U32 mCurrentProbeUpdateFrame = 0;
-    
+
     std::vector<LLPointer<LLVOVolume>>                       mHeroVOList;
     LLPointer<LLVOVolume>                                 mNearestHero;