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

indra/newview/lldrawpool.cpp

indra/newview/lldrawpoolalpha.cpp

indra/newview/lldrawpoolavatar.cpp

indra/newview/lldrawpoolbump.cpp

indra/newview/lldrawpoolmaterials.cpp

indra/newview/llfloaterperformance.cpp

indra/newview/llfloaterperformance.h

indra/newview/llperfstats.cpp

indra/newview/llperfstats.h

indra/newview/llviewerjointmesh.cpp

indra/newview/llviewerobject.h

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvovolume.cpp

indra/newview/llworld.cpp

indra/newview/llworld.h

indra/newview/pipeline.cpp

indra/newview/pipeline.h