Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2

.hgtags

doc/contributions.txt

indra/cmake/WebKitLibPlugin.cmake

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/newview/app_settings/ignorable_dialogs.xml

indra/newview/app_settings/settings.xml

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llfasttimerview.cpp

indra/newview/llfasttimerview.h

indra/newview/llfirstuse.cpp

indra/newview/llfirstuse.h