merge fixes for STORM-546

doc/contributions.txt

indra/newview/lldrawpool.h

indra/newview/lldrawpoolavatar.cpp

indra/newview/lldrawpoolavatar.h

indra/newview/lldrawpoolclouds.cpp

indra/newview/lldrawpoolclouds.h

indra/newview/lldrawpoolground.cpp

indra/newview/lldrawpoolground.h

indra/newview/lldrawpoolsky.cpp

indra/newview/lldrawpoolsky.h

indra/newview/lldrawpoolterrain.cpp

indra/newview/lldrawpoolterrain.h

indra/newview/lldrawpooltree.cpp

indra/newview/lldrawpooltree.h

indra/newview/lldrawpoolwater.cpp

indra/newview/lldrawpoolwater.h

indra/newview/llface.cpp

indra/newview/llface.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llglsandbox.cpp