Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge

BuildParams

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/llagent.cpp

indra/newview/llbottomtray.cpp

indra/newview/llchiclet.cpp

indra/newview/llfloatersounddevices.cpp

indra/newview/llfloatersounddevices.h

indra/newview/llimview.cpp

indra/newview/llmediactrl.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h

indra/newview/llpanelvoicedevicesettings.cpp

indra/newview/llspeakbutton.cpp

indra/newview/llspeakbutton.h

indra/newview/lltoolpie.cpp

indra/newview/lltoolpie.h