merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/newview/CMakeLists.txt

indra/newview/llagentpicksinfo.cpp

indra/newview/llagentui.cpp

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llchiclet.cpp

indra/newview/llimfloater.cpp

indra/newview/llinventorypanel.cpp

indra/newview/lllandmarkactions.cpp

indra/newview/lllandmarkactions.h

indra/newview/llnavigationbar.cpp

indra/newview/llnavigationbar.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

indra/newview/llnearbychatbar.cpp

indra/newview/llnearbychatbar.h

indra/newview/lloutputmonitorctrl.cpp