merge changes for 3.6.12-release

.hgtags

BuildParams

build.sh

doc/contributions.txt

indra/lib/python/indra/util/llmanifest.py

indra/llcommon/llsd.h

indra/llcommon/llsys.cpp

indra/llui/llcombobox.h

indra/llui/llmodaldialog.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

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

indra/newview/gpu_table.txt

indra/newview/installers/windows/installer_template.nsi

indra/newview/llagent.cpp

indra/newview/llblocklist.cpp

indra/newview/llblocklist.h

indra/newview/llchathistory.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloaterconversationpreview.cpp