From 188b778abcd4d06a9fcfcf0eee0cce8ccf00ed9b Mon Sep 17 00:00:00 2001
From: andreykproductengine <none@none>
Date: Thu, 29 Sep 2016 21:34:36 +0300
Subject: MAINT-6770 Remember appearance floater's chosen tab across logins

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 674923e88d..797b866724 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5241,6 +5241,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LastAppearanceTab</key>
+    <map>
+      <key>Comment</key>
+      <string>Last selected tab in appearance floater</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LastMediaSettingsTab</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 617bc0eded9b8df2d800a75eab107c079c468e9f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 4 Oct 2016 19:07:05 +0300
Subject: MAINT-6779 Allow to use last pic from Abuse report floater after
 relog

---
 indra/newview/app_settings/settings_per_account.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index fd6b1b5b3f..bed392d738 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -242,6 +242,17 @@
         <key>Value</key>
         <integer>0</integer>
       </map>
+    <key>PreviousScreenshotForReport</key>
+    <map>
+      <key>Comment</key>
+      <string>Use Previous Screenshot for Abuse report</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <!-- Settings below are for back compatibility only.
     They are not used in current viewer anymore. But they can't be removed to avoid
     influence on previous versions of the viewer in case of settings are not used or default value
-- 
cgit v1.2.3


From 0d223368d1e96f20c55437d92a0cbf236e8665eb Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 4 Oct 2016 16:41:17 +0300
Subject: MAINT-6748 Add Report Abuse as new Toolbar entry

---
 indra/newview/app_settings/commands.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index a0d3dc0f99..9bc0a7c701 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -282,4 +282,14 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="camera"
            />
+  <command name="reporter"
+           available_in_toybox="true"
+           icon="Command_Report_Abuse_Icon"
+           label_ref="Command_Report_Abuse_Label"
+           tooltip_ref="Command_Report_Abuse_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="reporter"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="reporter"
+           />
 </commands>
-- 
cgit v1.2.3


From 5828d061144fe1d15580dc6f9e00d7dcf93456ea Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 26 Oct 2016 15:10:40 +0300
Subject: SL-448 Implement a limit to block list

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8836ed0e5e..c6347c3f65 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6617,6 +6617,17 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
+    </map>
+    <key>MuteListLimit</key>
+    <map>
+      <key>Comment</key>
+      <string>Maximum number of entries in the mute list</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>1000</integer>
     </map>
 	<key>MyOutfitsAutofill</key>
 	<map>
-- 
cgit v1.2.3


From 950a6007db565832caa52b85194a6ca924d1b5ac Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 11 Nov 2016 19:26:07 +0200
Subject: MAINT-6909 Marking settings as obsolete

---
 indra/newview/app_settings/settings_per_account.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index bed392d738..eee13fb28e 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -262,7 +262,7 @@
     <key>LogChat</key>
         <map>
         <key>Comment</key>
-            <string>Log Chat</string>
+            <string>Obsolete - this setting is no longer used and has no effect.</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
@@ -273,7 +273,7 @@
     <key>LogChatIM</key>
         <map>
         <key>Comment</key>
-            <string>Log Incoming Instant Messages with Chat</string>
+            <string>Obsolete - this setting is no longer used and has no effect.</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
@@ -284,7 +284,7 @@
     <key>LogChatTimestamp</key>
         <map>
         <key>Comment</key>
-            <string>Log Timestamp of Chat</string>
+            <string>Obsolete - this setting is no longer used and has no effect.</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
@@ -292,6 +292,7 @@
         <key>Value</key>
             <integer>0</integer>
         </map>
+    <!-- End of back compatibility settings -->
     <key>TranslatingEnabled</key>
         <map>
         <key>Comment</key>
@@ -347,6 +348,5 @@
         <key>Value</key>
              <integer>1</integer>
         </map>
-    <!-- End of back compatibility settings -->
     </map>
 </llsd>
-- 
cgit v1.2.3


From 4040b452a37622feec0ad1d4eeb0492c636d1cd5 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 16 Nov 2016 15:54:00 +0200
Subject: MAINT-6872 Account for CTRL+0 zoom when mesh LOD is calculated

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7af0067f5b..399a4bf5ac 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4614,6 +4614,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>IgnoreFOVZoomForLODs</key>
+    <map>
+      <key>Comment</key>
+      <string>Ignore zoom effect(CTRL+0) when calculating lods.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>IgnoreAllNotifications</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3