Merge branch 'master' into DRTVWR-518-ui

doc/contributions.txt

indra/llcharacter/lljoint.cpp

indra/llcharacter/lljoint.h

indra/llprimitive/lldaeloader.cpp

indra/llprimitive/lldaeloader.h

indra/llprimitive/llmodelloader.cpp

indra/llprimitive/llmodelloader.h

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

...newview/app_settings/shaders/class1/objects/previewV.glsl

indra/newview/lldynamictexture.cpp