Merge

indra/llui/lldockablefloater.cpp

indra/llui/llfloater.cpp

indra/llui/llslider.cpp

indra/llui/llslider.h

indra/llui/lltoggleablemenu.cpp

indra/llui/lltoggleablemenu.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llavataractions.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchatbar.cpp

indra/newview/llchathistory.cpp

indra/newview/llchiclet.cpp