Merge from default branch

indra/llcommon/llfasttimer.h

indra/llcommon/llfasttimer_class.cpp

indra/llcommon/llprocessor.cpp

indra/llcommon/llsys.cpp

indra/llcommon/llsys.h

indra/llcommon/lltimer.cpp

indra/llcommon/llversionviewer.h

indra/llmessage/llassetstorage.cpp

indra/llmessage/llassetstorage.h

indra/llmessage/llhttpassetstorage.cpp

indra/llmessage/llhttpassetstorage.h

indra/media_plugins/webkit/windows_volume_catcher.cpp

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloatertos.cpp

indra/newview/llfloatertos.h

indra/newview/llmoveview.cpp

indra/newview/llpanelnearbymedia.cpp

indra/newview/llpanelprimmediacontrols.cpp