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

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llbottomtray.cpp

indra/newview/llchathistory.cpp

indra/newview/llcofwearables.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloatersidepanelcontainer.cpp

indra/newview/llfloatersidepanelcontainer.h

indra/newview/llfloatersidetraytab.cpp

indra/newview/llfloatersidetraytab.h

indra/newview/llgroupactions.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llinspectobject.cpp

indra/newview/llinventorybridge.cpp