From 9bed2adb1bb404c92509fac8b97637acba71eabb Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 2 Feb 2022 10:05:57 +0100
Subject: [PATCH] Git rid of "ForcePeriodicRenderingTime" - it's not in the LL
 viewer and wasn't used anyway

---
 indra/newview/app_settings/settings.xml | 11 ----------
 indra/newview/llappviewer.cpp           | 28 -------------------------
 2 files changed, 39 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e751445ba8..3af34626eb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -18667,17 +18667,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Backup</key>
       <integer>0</integer>
     </map>
-    <key>ForcePeriodicRenderingTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Periodically enable all rendering masks for a single frame.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>-1.0</real>
-    </map>
     <key>ZoomDirect</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2b0fae1bc9..6aed82e0c8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1651,10 +1651,6 @@ bool LLAppViewer::doFrame()
 	}
 #endif
 // </FS:Beq>
-	// <FS:Ansariel> MaxFPS Viewer-Chui merge error
-	LLTimer periodicRenderingTimer;
-	BOOL restore_rendering_masks = FALSE;
-	// </FS:Ansariel> MaxFPS Viewer-Chui merge error
 	// <FS:Ansariel> FIRE-22297: FPS limiter not working properly on Mac/Linux
 	LLTimer frameTimer;
 
@@ -1678,30 +1674,6 @@ bool LLAppViewer::doFrame()
 	} // <FS:Beq/> perf stats
 	{
 		{FSPerfStats::RecordSceneTime T (FSPerfStats::StatType_t::RENDER_IDLE); // <FS:Beq> ensure we have the entire top scope of frame covered
-		// <FS:Ansariel> MaxFPS Viewer-Chui merge error
-		// Check if we need to restore rendering masks.
-		if (restore_rendering_masks)
-		{
-			gPipeline.popRenderDebugFeatureMask();
-			gPipeline.popRenderTypeMask();
-		}
-		// Check if we need to temporarily enable rendering.
-		//F32 periodic_rendering = gSavedSettings.getF32("ForcePeriodicRenderingTime");
-		static LLCachedControl<F32> periodic_rendering(gSavedSettings, "ForcePeriodicRenderingTime", -1.f);
-		if (periodic_rendering > F_APPROXIMATELY_ZERO && periodicRenderingTimer.getElapsedTimeF64() > periodic_rendering)
-		{
-			periodicRenderingTimer.reset();
-			restore_rendering_masks = TRUE;
-			gPipeline.pushRenderTypeMask();
-			gPipeline.pushRenderDebugFeatureMask();
-			gPipeline.setAllRenderTypes();
-			gPipeline.setAllRenderDebugFeatures();
-		}
-		else
-		{
-			restore_rendering_masks = FALSE;
-		}
-		// </FS:Ansariel> MaxFPS Viewer-Chui merge error
 
 		LL_PROFILE_ZONE_NAMED_CATEGORY_APP( "df processMiscNativeEvents" )
 		pingMainloopTimeout("Main:MiscNativeWindowEvents");