merge from product-engine

indra/llui/lldockablefloater.cpp

indra/llui/lltextbase.h

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchannelmanager.cpp

indra/newview/llchannelmanager.h

indra/newview/llchiclet.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfriendcard.cpp

indra/newview/llfriendcard.h

indra/newview/lljoystickbutton.cpp

indra/newview/lljoystickbutton.h

indra/newview/lllandmarkactions.cpp

indra/newview/lllandmarkactions.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

indra/newview/llnearbychatbar.cpp

indra/newview/llnotificationgrouphandler.cpp