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

indra/llui/llmenugl.cpp

indra/newview/llappviewer.cpp

indra/newview/lldirpicker.cpp

indra/newview/llfilepicker.cpp

indra/newview/llinventorybridge.cpp

indra/newview/lllandmarkactions.cpp

indra/newview/lltoolbarview.cpp

indra/newview/lltoolbarview.h

indra/newview/lltoolgun.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llviewerwindow.h

indra/newview/skins/default/xui/en/main_view.xml

indra/newview/skins/default/xui/en/menu_viewer.xml