merge

indra/llrender/llcubemap.cpp

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llimagegl.cpp

indra/llrender/llpostprocess.cpp

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llrendersphere.cpp

indra/llrender/llrendersphere.h

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llaccordionctrltab.cpp

indra/llui/llui.cpp

indra/llui/llview.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/app_settings/logcontrol.xml