diff options
author | Brad Kittenbrink <brad@lindenlab.com> | 2022-05-04 14:47:52 -0700 |
---|---|---|
committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-05-04 14:47:52 -0700 |
commit | 5ac6f139655815b81a3a4ffce71f0650da771f6f (patch) | |
tree | a31bb66a1115cfba2a1a27b8e705aebfaf80c75f /indra/newview/app_settings | |
parent | 93260cfeff2382dd1ffeecaef208d37bf21c2a01 (diff) | |
parent | bc7e2fb7e7f7527b522bdf6f4c791f3b660485e2 (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-559
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 a6dce3cceb..20b708fe99 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16829,5 +16829,16 @@ <key>Value</key> <integer>0</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> |