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

indra/llui/lllineeditor.h

indra/newview/CMakeLists.txt

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llchiclet.cpp

indra/newview/llchiclet.h

indra/newview/llfriendcard.cpp

indra/newview/llfriendcard.h

indra/newview/llimfloater.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelimcontrolpanel.h

indra/newview/llpanellandmarkinfo.cpp

indra/newview/llpanellandmarkinfo.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llpanelpick.cpp

indra/newview/llpanelpick.h