diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-04 18:52:52 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-04 18:52:52 +0300 |
| commit | 59d5443905f406344ed26ac9d226b5a574d5dcf0 (patch) | |
| tree | 423c9bece2d5650bb968095865ee7b3c6fc801e5 /indra/newview/app_settings | |
| parent | 29de643ffd09257844156c3414f800d84092d790 (diff) | |
| parent | bc7e2fb7e7f7527b522bdf6f4c791f3b660485e2 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/viewer_components/login/lllogin.cpp
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7f8ebbae92..4958cf4264 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16826,5 +16826,16 @@ <key>Value</key> <integer>1</integer> </map> + <key>MFAHash</key> + <map> + <key>Comment</key> + <string>Override MFA state hash for authentication</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string></string> + </map> </map> </llsd> |