merge changes for 3.6.11-release

.hgtags

doc/contributions.txt

indra/llcommon/llsd.h

indra/llcommon/llsys.cpp

indra/llui/llcombobox.h

indra/llui/llmodaldialog.cpp

indra/newview/VIEWER_VERSION.txt

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

indra/newview/gpu_table.txt

indra/newview/llagent.cpp

indra/newview/llblocklist.cpp

indra/newview/llblocklist.h

indra/newview/llchathistory.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloaterconversationpreview.cpp

indra/newview/llfloaterland.cpp

indra/newview/llpersistentnotificationstorage.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerregion.cpp

indra/newview/llvoavatar.cpp