Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into cronchy

indra/llcommon/llerror.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llwindow/llwindowwin32.cpp

indra/newview/lldrawable.cpp

indra/newview/lldrawpoolalpha.cpp

indra/newview/llmeshrepository.cpp

indra/newview/llviewerobject.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp

indra/newview/llvovolume.cpp

indra/newview/pipeline.cpp

indra/newview/pipeline.h