Merge

indra/llcommon/llstring.cpp

indra/llui/llflatlistview.cpp

indra/llui/llresizebar.cpp

indra/llui/llscrollcontainer.cpp

indra/newview/CMakeLists.txt

indra/newview/llavatariconctrl.cpp

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llcallingcard.cpp

indra/newview/llchathistory.cpp

indra/newview/llchathistory.h

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llchatitemscontainerctrl.h

indra/newview/llfloatercamera.cpp

indra/newview/llfloatercamera.h

indra/newview/llfloatergesture.cpp