merge.

indra/cmake/run_build_test.py

indra/llaudio/llaudiodecodemgr.cpp

indra/llui/CMakeLists.txt

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llnotificationptr.h

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/llui/llnotificationsutil.cpp

indra/llui/llnotificationsutil.h

indra/llxuixml/lltrans.cpp

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h