Merge branch master (D550) into DRTVWR-546
# Conflicts: # indra/newview/llappviewer.h
No related branches found
No related tags found
Showing
- indra/cmake/Boost.cmake 8 additions, 8 deletionsindra/cmake/Boost.cmake
- indra/newview/app_settings/settings.xml 11 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llappviewer.cpp 5 additions, 0 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewer.h 1 addition, 1 deletionindra/newview/llappviewer.h
- indra/newview/lllogininstance.cpp 67 additions, 1 deletionindra/newview/lllogininstance.cpp
- indra/newview/llsecapi.h 3 additions, 0 deletionsindra/newview/llsecapi.h
- indra/newview/llsechandler_basic.cpp 5 additions, 0 deletionsindra/newview/llsechandler_basic.cpp
- indra/newview/llsechandler_basic.h 3 additions, 0 deletionsindra/newview/llsechandler_basic.h
- indra/newview/llstartup.cpp 40 additions, 5 deletionsindra/newview/llstartup.cpp
- indra/newview/skins/default/xui/en/floater_mfa.xml 49 additions, 0 deletionsindra/newview/skins/default/xui/en/floater_mfa.xml
- indra/newview/skins/default/xui/en/notifications.xml 21 additions, 0 deletionsindra/newview/skins/default/xui/en/notifications.xml
- indra/newview/skins/default/xui/en/strings.xml 3 additions, 1 deletionindra/newview/skins/default/xui/en/strings.xml
- indra/newview/tests/lllogininstance_test.cpp 8 additions, 0 deletionsindra/newview/tests/lllogininstance_test.cpp
- indra/newview/tests/llsecapi_test.cpp 1 addition, 0 deletionsindra/newview/tests/llsecapi_test.cpp
- indra/viewer_components/login/lllogin.cpp 22 additions, 11 deletionsindra/viewer_components/login/lllogin.cpp
Loading
Please register or sign in to comment