Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-popup

indra/llappearance/llavatarappearance.cpp

indra/llappearance/llwearabletype.cpp

indra/llaudio/llaudiodecodemgr.cpp

indra/llcharacter/llkeyframemotion.cpp

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llimage/llimage.cpp

indra/llimage/llimagebmp.cpp

indra/llimage/llimagedxt.cpp

indra/llimage/llimagejpeg.cpp

indra/llimage/llimagepng.cpp

indra/llimage/llimagetga.cpp

indra/llimage/llpngwrapper.cpp

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/llrender/llimagegl.cpp

indra/mac_crash_logger/CMakeLists.txt

indra/newview/llfeaturemanager.cpp

indra/newview/llfloaternotificationstabbed.cpp

indra/newview/llimprocessing.cpp