Merge downstream code

.hgtags

BuildParams

autobuild.xml

indra/llappearance/lltexlayer.cpp

indra/llappearance/llwearable.cpp

indra/llcommon/llapp.cpp

indra/llcommon/llapp.h

indra/llcommon/llfoldertype.cpp

indra/llimage/llimage.cpp

indra/llimage/llimageworker.cpp

indra/llimage/tests/llimageworker_test.cpp

indra/llrender/llcubemap.cpp

indra/llrender/llfontfreetype.cpp

indra/llrender/llimagegl.cpp

indra/llui/llfolderview.cpp

indra/llui/llfolderview.h

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

...wview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

...app_settings/shaders/class1/deferred/diffuseSkinnedV.glsl