SL-16220: Merge branch 'origin/DRTVWR-546' into glthread

autobuild.xml

indra/llcommon/lltracerecording.cpp

indra/llcommon/lltracerecording.h

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llui/llstatbar.cpp

indra/llui/llstatbar.h

indra/llwindow/GL/glh_extensions.h

indra/llwindow/GL/glh_genext.h

indra/newview/llappviewer.cpp

indra/newview/lldrawpoolwater.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llviewercontrol.cpp

indra/newview/llviewershadermgr.cpp

indra/newview/llviewerstats.cpp

indra/newview/llviewerstats.h

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/pipeline.cpp

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