From d71e3f950cf84f67360e1ac7552c01c18eeb6d09 Mon Sep 17 00:00:00 2001
From: simon_linden <none@none>
Date: Wed, 9 Oct 2013 11:45:20 -0700
Subject: MAINT-3285 : RenderDepthOfField debug setting needs description tweak

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1c532e957e..13018b4f06 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8696,7 +8696,7 @@
   <key>RenderDepthOfField</key>
   <map>
     <key>Comment</key>
-    <string>Whether to use depth of field effect when lighting and shadows are enabled</string>
+    <string>Whether to use depth of field effect when Advanced Lighting Model is enabled</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
-- 
cgit v1.2.3


From 617b6918dee605901a0c8eabf5213dd03767a971 Mon Sep 17 00:00:00 2001
From: Maestro Linden <maestro@lindenlab.com>
Date: Mon, 21 Oct 2013 22:21:42 +0000
Subject: MAINT-3339 fix for invalid default permissions in Adjust Content
 Permissions floater.  Reviewed by Simon.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 13018b4f06..db9edd1e86 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1203,7 +1203,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>BulkChangeShareWithGroup</key>
     <map>
-- 
cgit v1.2.3


From 89d5d01c412a8e0a3b4f2f2c9a504f0e3f609349 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 11 Nov 2013 18:41:25 -0800
Subject: MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated
 fields moved viewer information strings into LLAppViewer replaced Help>Report
 a Bug with direct use of Jira link

---
 indra/newview/app_settings/settings.xml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index db9edd1e86..e08eed83ec 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3569,13 +3569,13 @@
     <key>FPSLogFrequency</key>
         <map>
         <key>Comment</key>
-            <string>Seconds between display of FPS in log (0 for never)</string>
+        <string>Seconds between display of FPS in log (0 for never)</string>
         <key>Persist</key>
-            <integer>1</integer>
+        <integer>1</integer>
         <key>Type</key>
-            <string>F32</string>
+        <string>F32</string>
         <key>Value</key>
-            <real>10.0</real>
+        <real>10.0</real>
         </map>
     <key>FilterItemsMaxTimePerFrameVisible</key>
     <map>
@@ -9991,7 +9991,18 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>RevokePermsOnStopAnimation</key>
+		<key>ReportBugURL</key>
+		<map>
+			<key>Comment</key>
+			<string>URL used for filing bugs from viewer</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>String</string>
+			<key>Value</key>
+			<string>https://jira.secondlife.com/secure/CreateIssueDetails!init.jspa?pid=10610&amp;issuetype=1&amp;environment=[ENVIRONMENT]&amp;customfield_10253=[LOCATION]</string>
+		</map>
+	<key>RevokePermsOnStopAnimation</key>
     <map>
       <key>Comment</key>
       <string>Clear animation permssions when choosing "Stop Animating Me"</string>
-- 
cgit v1.2.3