summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
AgeCommit message (Collapse)Author
2022-05-05Merge branch 'master' v 6.5.6 into DRTVWR-528Dave Houlton
2022-04-25Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get ↵Brad Kittenbrink
lost in case of crash
2022-04-18Merge branch 'master' into DRTVWR-528Dave Houlton
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-04-05Merge remote-tracking branch 'origin/SL-16950' into DRTVWR-540-maintAndrey Lihatskiy
2022-03-29SL-16831 Viewer stalls for 10 seconds before displaying a login failureAndrey Kleshchev
# Conflicts: # indra/newview/llstartup.cpp
2022-03-17SL-17019 mfa_hash should get saved per-usernameBrad Kittenbrink
2022-03-08Oops, forgot the other half of SL-16825 fix. need to check both ↵Brad Kittenbrink
"RememberUser" and "RememberPassword" settings
2022-03-08SL-16950 - handle case that an initial outfit is created in user inventory ↵Brad Payne (Vir Linden)
before first login
2022-03-07Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-03-07SL-16825 saving of mfa_hash data now obeys the 'Remember Me' settingBrad Kittenbrink
2022-02-28Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
2022-02-04Related to fix for SL-16792, standardize on naming the filed simply mfa_hash ↵Brad Kittenbrink
end-to-end to avoid confusion
2022-02-02SL-14769 Allow to log-in, even if there's an inventory errorMnikolenko Productengine
2022-01-14SL-16514 store mfa hash in protected data using LLSecAPIBasicHandlerBrad Kittenbrink
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-15Merge remote-tracking branch 'origin/master' into brad/DRTVWR-550-mfaBrad Kittenbrink
2021-12-15DRTVWR-528 merge up to 6.5.2Dave Houlton
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-13SL-16501 SLMFAHash is now saved client sideBrad Kittenbrink
2021-12-08SL-16450 Don not crash viewer in case of invalid data typeAndrey Kleshchev
2021-11-23SL-16388 Viewer MFA ImplementationBrad Kittenbrink
We now present MFA errors to the user during login and prompt them for an authentication token.
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-16Merge branch 'master' v6.5.1 into DRTVWR-528Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-07-19Merge branch 'master' v 6.4.22 into DRTVWR-528Dave Houlton
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
2021-07-05SL-15527 remove redundant flagMnikolenko Productengine
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-06-24Merge branch 'master' v 6.4.21 into DRTVWR-528Dave Houlton
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-06SL-15168 Viewer side functionality for guidebook window openingAndrey Kleshchev
2021-04-30SL-14769 Add dialog to warn user if inventory is unusable, force logoutMnikolenko Productengine
2021-04-30Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 18:35:20 +0000