summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-05-26 05:43:35 -0400
committerJonathan Yap <none@none>2011-05-26 05:43:35 -0400
commit9ecc872b731b5863f320446089bc5679832b0890 (patch)
treedfaea905fb812e3386f7fb0e0163efd98f8fa1a7
parentfda331bb801918aab3eb5b7026f7e868eca248a2 (diff)
STORM-1273 Duplicate entries in settings.xml
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/app_settings/settings.xml22
2 files changed, 1 insertions, 22 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index dfbccb5a6c..f226865442 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 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>
@@ -8867,17 +8856,6 @@
<key>Value</key>
<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>RenderUseFarClip</key>
<map>
<key>Comment</key>