Merged 1.2.0-radar2 into 1.2.0-next

1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 60abc1b..f4d853b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5245,7 +5245,7 @@
               <key>Type</key>
               <string>F32</string>
               <key>Value</key>
-              <integer>20</integer>
+              <integer>96</integer>
     </map>
     <key>NewCacheLocation</key>
     <map>
@@ -10339,6 +10339,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>WarnFirstMiniMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstMiniMap warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>WarnFirstOverrideKeys</key>
     <map>
       <key>Comment</key>