Merge giab-viewer-trunk 2497, general merge of more

indra/llmessage/llares.cpp

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llcurrencyuimanager.cpp

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloaterreporter.cpp

indra/newview/llloginhandler.cpp

indra/newview/llloginhandler.h

indra/newview/lllogininstance.cpp

indra/newview/lllogininstance.h

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h

indra/newview/llsecapi.cpp

indra/newview/llsecapi.h

indra/newview/llsechandler_basic.cpp