Automated merge with ssh://hg.lindenlab.com/q/viewer-release

indra/llimage/llimage.cpp

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/llappviewer.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

...view/skins/default/xui/en/panel_preferences_graphics1.xml