Merge with viewer-2.0.0-3

indra/integration_tests/llui_libtest/CMakeLists.txt

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llinventory/llinventory.cpp

indra/llinventory/llinventory.h

indra/llinventory/llinventorytype.cpp

indra/llmath/xform.h

indra/llmessage/lltransfersourceasset.cpp

indra/llmessage/message_prehash.cpp

indra/llmessage/message_prehash.h

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/llwindow/CMakeLists.txt

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h