Merge dire

indra/llrender/llgl.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/newview/app_settings/settings_alchemy.xml

indra/newview/llpanelface.cpp

indra/newview/llpanelface.h

indra/newview/llviewermenu.cpp

indra/newview/llviewertexture.cpp

indra/newview/llviewertexture.h

indra/newview/llviewertexturelist.cpp

...ewview/skins/default/xui/en/floater_hardware_settings.xml

indra/newview/skins/default/xui/en/menu_object.xml

indra/newview/skins/default/xui/en/panel_tools_texture.xml