Merge from product-engine

indra/llui/llflatlistview.h

indra/llui/llfloater.h

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/llavataractions.cpp

indra/newview/llchathistory.cpp

indra/newview/llimfloater.cpp

indra/newview/llimview.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanellogin.cpp

indra/newview/llpanelme.cpp

indra/newview/llpanelme.h

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpeople.h

indra/newview/llpanelpicks.h

indra/newview/llpanelprofile.cpp

indra/newview/llpanelprofile.h

indra/newview/llpanelprofileview.cpp

indra/newview/llpanelprofileview.h