Le Merge

indra/llrender/llatmosphere.cpp

indra/llrender/llatmosphere.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/llrender/llvertexbuffer.cpp

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/shaders/class3/deferred/skyF.glsl

indra/newview/app_settings/shaders/class3/deferred/skyV.glsl

.../app_settings/shaders/class3/windlight/advancedAtmoF.glsl

indra/newview/lldrawpoolground.cpp

indra/newview/lldrawpoolsky.cpp

indra/newview/lldrawpoolwater.cpp

indra/newview/lldrawpoolwlsky.cpp

indra/newview/lldrawpoolwlsky.h

indra/newview/llglsandbox.cpp