Merged in lindenlab/viewer-bear

indra/llvfs/lldir_linux.cpp

indra/llvfs/lldir_mac.cpp

indra/llvfs/lldir_solaris.cpp

indra/llvfs/lldir_win32.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/CA.pem

indra/newview/app_settings/settings.xml

indra/newview/llappcorehttp.cpp

indra/newview/llappviewer.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloaterbvhpreview.cpp

indra/newview/llsecapi.h

indra/newview/llsechandler_basic.cpp

indra/newview/llsechandler_basic.h

indra/newview/llviewermedia.cpp

indra/newview/llviewerobjectlist.cpp

indra/newview/llviewerpartsim.cpp

indra/newview/llviewerstats.cpp

indra/newview/llvoicechannel.cpp