From 029b41c0419e975bbb28454538b46dc69ce5d2ba Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Mon, 15 Nov 2021 09:25:35 -0700
Subject: Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"

This reverts commit 5188a26a8521251dda07ac0140bb129f28417e49, reversing
changes made to 819088563e13f1d75e048311fbaf0df4a79b7e19.
---
 indra/newview/app_settings/settings.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 607e531e62..f15b5d0981 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3858,17 +3858,6 @@
         <key>Value</key>
         <integer>1</integer>
     </map>
-    <key>MainWorkTime</key>
-    <map>
-        <key>Comment</key>
-        <string>Max time per frame devoted to mainloop work queue (in milliseconds)</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>F32</string>
-        <key>Value</key>
-        <real>0.1</real>
-    </map>
     <key>QueueInventoryFetchTimeout</key>
     <map>
         <key>Comment</key>
@@ -12674,20 +12663,6 @@
       <key>Value</key>
       <integer>50</integer>
     </map>
-    <key>ThreadPoolSizes</key>
-    <map>
-      <key>Comment</key>
-      <string>Map of size overrides for specific thread pools.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>LLSD</string>
-      <key>Value</key>
-      <map>
-        <key>General</key>
-        <integer>4</integer>
-      </map>
-    </map>
     <key>ThrottleBandwidthKBPS</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3