aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-23 21:07:05 -0700
committerMcCabe Maxsted2010-08-26 11:26:15 -0700
commitbb356b9821442fb2d4fb0590fdfa8dd562f55b53 (patch)
tree7712fec9761a5a2fbd2cbed661dd510fdada0a53 /linden/indra/newview/app_settings
parentFixed lowercase 'c' in build window 'cut's (diff)
downloadmeta-impy-bb356b9821442fb2d4fb0590fdfa8dd562f55b53.zip
meta-impy-bb356b9821442fb2d4fb0590fdfa8dd562f55b53.tar.gz
meta-impy-bb356b9821442fb2d4fb0590fdfa8dd562f55b53.tar.bz2
meta-impy-bb356b9821442fb2d4fb0590fdfa8dd562f55b53.tar.xz
Added vivox license window when enabling voice or starting up for the first time (voice can now be included from here on out :)
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r--linden/indra/newview/app_settings/settings.xml24
1 files changed, 23 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 9f67615..1951e07 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -844,6 +844,17 @@
844 <key>Value</key> 844 <key>Value</key>
845 <integer>0</integer> 845 <integer>0</integer>
846 </map> 846 </map>
847 <key>VivoxLicenseAccepted</key>
848 <map>
849 <key>Comment</key>
850 <string>By setting to true, you agree to accept the Vivox personal license agreement at http://www.vivox.com/vivox_aup.html</string>
851 <key>Persist</key>
852 <integer>1</integer>
853 <key>Type</key>
854 <string>Boolean</string>
855 <key>Value</key>
856 <integer>0</integer>
857 </map>
847 <key>WarnFirstAO</key> 858 <key>WarnFirstAO</key>
848 <map> 859 <map>
849 <key>Comment</key> 860 <key>Comment</key>
@@ -877,6 +888,17 @@
877 <key>Value</key> 888 <key>Value</key>
878 <integer>1</integer> 889 <integer>1</integer>
879 </map> 890 </map>
891 <key>WarnFirstVoiceLicense</key>
892 <map>
893 <key>Comment</key>
894 <string>Enables FirstVoiceLicense window on login</string>
895 <key>Persist</key>
896 <integer>1</integer>
897 <key>Type</key>
898 <string>Boolean</string>
899 <key>Value</key>
900 <integer>1</integer>
901 </map>
880 <key>DefaultGrid</key> 902 <key>DefaultGrid</key>
881 <map> 903 <map>
882 <key>Comment</key> 904 <key>Comment</key>
@@ -4531,7 +4553,7 @@
4531 <key>Type</key> 4553 <key>Type</key>
4532 <string>Boolean</string> 4554 <string>Boolean</string>
4533 <key>Value</key> 4555 <key>Value</key>
4534 <integer>1</integer> 4556 <integer>0</integer>
4535 </map> 4557 </map>
4536 <key>EnergyFromTop</key> 4558 <key>EnergyFromTop</key>
4537 <map> 4559 <map>