From 9ecc872b731b5863f320446089bc5679832b0890 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Thu, 26 May 2011 05:43:35 -0400
Subject: [PATCH] STORM-1273 Duplicate entries in settings.xml
---
doc/contributions.txt | 1 +
indra/newview/app_settings/settings.xml | 22 ----------------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index dfbccb5a6c9..f226865442c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -440,6 +440,7 @@ Jonathan Yap
STORM-1095
STORM-1236
STORM-1259
+ STORM-1273
Kage Pixel
VWR-11
Ken March
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 78db307d648..1a202c168aa 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>
--
GitLab