summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-21 10:38:39 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-21 10:38:39 -0400
commitbe553242ef706e33260f3f9e62d02f4720f00473 (patch)
tree553a150a63cd8105f8860780ef7d02f12a69eb23 /indra/newview/app_settings/settings.xml
parent9c1c791b29cb5087ebff142d4ad7a55b65be0ad0 (diff)
parentdf63c6931e81c034887611711095e3134b9a7318 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml15
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 92a3a0299a..e27397ab1a 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3270,7 +3270,7 @@
<key>FirstRunThisInstall</key>
<map>
<key>Comment</key>
- <string>Specifies that you have not run the viewer since you installed the latest update</string>
+ <string>Specifies that you have not run the viewer since you performed a clean install</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -3278,7 +3278,18 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>FirstSelectedDisabledPopups</key>
+ <key>FirstLoginThisInstall</key>
+ <map>
+ <key>Comment</key>
+ <string>Specifies that you have not logged in with the viewer since you performed a clean install</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstSelectedDisabledPopups</key>
<map>
<key>Comment</key>
<string>Return false if there is not disabled popup selected in the list of floater preferences popups</string>