Automated merge

indra/llimage/CMakeLists.txt

indra/llimage/llimagedimensionsinfo.cpp

indra/llimage/llimagedimensionsinfo.h

indra/llplugin/slplugin/CMakeLists.txt

indra/llplugin/slplugin/slplugin.cpp

indra/llplugin/slplugin/slplugin_info.plist

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llvfs/lldir_mac.cpp

indra/newview/app_settings/settings.xml

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llcallfloater.cpp

indra/newview/llchiclet.cpp

indra/newview/llchiclet.h

indra/newview/llfloaterimagepreview.cpp

indra/newview/llfloaterimagepreview.h

indra/newview/llgrouplist.cpp

indra/newview/llgrouplist.h

indra/newview/llimview.cpp