merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3

indra/llui/llfloater.h

indra/newview/CMakeLists.txt

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchannelmanager.cpp

indra/newview/llchannelmanager.h

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llchatitemscontainerctrl.h

indra/newview/llchatmsgbox.cpp

indra/newview/llchatmsgbox.h

indra/newview/llchiclet.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

indra/newview/llnearbychathandler.cpp

indra/newview/llnearbychathandler.h

indra/newview/llnotificationalerthandler.cpp

indra/newview/llnotificationgrouphandler.cpp

indra/newview/llnotificationhandler.h

indra/newview/llnotificationmanager.cpp

indra/newview/llnotificationmanager.h