From 5e2b781e7886c3238645b5fcff9017ed960396e9 Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Thu, 14 Apr 2011 08:11:06 -0400
Subject: STORM-1103 Nearby sidebar minimap should be optional

---
 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 d98f0da1c2..ebddb2d73a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9177,6 +9177,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>NearbyListShowMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Show/hide map in nearby list</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>NearbyListShowIcons</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From c3e4fd975cd6ce7af9521143d469ec9f017d47dd Mon Sep 17 00:00:00 2001
From: Twisted_Laws <none@none>
Date: Fri, 15 Apr 2011 14:32:56 -0400
Subject: STORM-1103 Nearby sidebar minimap should be optional, changes from
 review

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ebddb2d73a..bb4f2664cd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9180,7 +9180,7 @@
     <key>NearbyListShowMap</key>
     <map>
       <key>Comment</key>
-      <string>Show/hide map in nearby list</string>
+      <string>Show/hide map above nearby people list</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-- 
cgit v1.2.3


From 9ecc872b731b5863f320446089bc5679832b0890 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 26 May 2011 05:43:35 -0400
Subject: STORM-1273 Duplicate entries in settings.xml

---
 indra/newview/app_settings/settings.xml | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 78db307d64..1a202c168a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3245,17 +3245,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>FirstLoginThisInstall</key>
-    <map>
-      <key>Comment</key>
-      <string>Specifies that you have not successfully logged in since you installed the latest update</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>FirstName</key>
     <map>
       <key>Comment</key>
@@ -8857,17 +8846,6 @@
       <integer>0</integer>
     </map>
   <key>RenderUseTriStrips</key>
-  <map>
-    <key>Comment</key>
-    <string>Use triangle strips for rendering prims.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>0</integer>
-  </map>
-  <key>RenderUseTriStrips</key>
   <map>
     <key>Comment</key>
     <string>Use triangle strips for rendering prims.</string>
-- 
cgit v1.2.3


From ac504815137ec01767717e7c1a4c419a995f629c Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 12 Jun 2011 16:00:33 -0400
Subject: STORM-787 Mute Gestures Button

---
 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 fc7fd2dd8a..9b12b8057f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3058,6 +3058,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnableGestureSounds</key>
+    <map>
+      <key>Comment</key>
+      <string>Play sounds from gestures</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnableMouselook</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From 8b1f9529dd4d54a19dbab739ec5af81e95b53b23 Mon Sep 17 00:00:00 2001
From: jenn <jenn@lindenlab.com>
Date: Tue, 14 Jun 2011 15:24:48 +0000
Subject: Enabling watchdog timer with timeout of 20.

This is in support of a Viewer crash pile-on. It is intended to ship to Beta, then either be reverted or have an increased timeout prior to shipping to release.
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fc7fd2dd8a..9161519a10 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12406,7 +12406,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>-1</integer>
+      <integer>20</integer>
     </map>
     <key>WaterEditPresets</key>
     <map>
-- 
cgit v1.2.3


From 6532d5db2dc450295d7ee4272600aaf79188ebc1 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 15 Jun 2011 18:38:30 -0400
Subject: SH-1166 WIP

---
 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 036408807d..27a9737d69 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5600,6 +5600,17 @@
     <key>Value</key>
     <real>0</real>
   </map>
+  <key>MeshUploadFakeErrors</key>
+  <map>
+    <key>Comment</key>
+    <string>Force upload errors (for testing)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <real>0</real>
+  </map>
   <key>MigrateCacheDirectory</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3