diff options
| author | James Cook <james@lindenlab.com> | 2008-11-19 23:26:29 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-11-19 23:26:29 +0000 |
| commit | 2a44e81675d22aa5ed0844d5a4ac18bb9bd49f64 (patch) | |
| tree | 595dd4b8b7beac938fc0e14ee075e5cfeb1f129b /indra/newview/app_settings | |
| parent | 2d2d427158ca2465e2d70d84b4499cab57e2e208 (diff) | |
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b01fbbec4f..62bc827bb1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3971,7 +3971,18 @@ <key>Value</key> <real>0.0</real> </map> - <key>InventoryAutoOpenDelay</key> + <key>InstallLanguage</key> + <map> + <key>Comment</key> + <string>Language passed from installer (for UI)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>default</string> + </map> + <key>InventoryAutoOpenDelay</key> <map> <key>Comment</key> <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string> @@ -4221,7 +4232,7 @@ <key>Language</key> <map> <key>Comment</key> - <string>Language specifier (for XUI)</string> + <string>Language specifier (for UI)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -7670,7 +7681,7 @@ <key>SystemLanguage</key> <map> <key>Comment</key> - <string>Language indicated by system settings (for XUI)</string> + <string>Language indicated by system settings (for UI)</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |