merge changes for storm-1019

.hgtags

BuildParams

doc/contributions.txt

indra/integration_tests/CMakeLists.txt

indra/integration_tests/llimage_libtest/CMakeLists.txt

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/integration_tests/llimage_libtest/llimage_libtest.h

indra/llcommon/llmetricperformancetester.cpp

indra/llcommon/llmetricperformancetester.h

indra/llcommon/llversionviewer.h

indra/llimage/llimage.h

indra/llimage/llimagej2c.cpp

indra/llui/llmenugl.cpp

indra/newview/app_settings/ignorable_dialogs.xml

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp