Merge from viewer2. Minor conflict resolved.

etc/message.xml

indra/llcommon/llfasttimer.h

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llui/llaccordionctrltab.cpp

indra/llui/llflatlistview.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/lllayoutstack.h

indra/llui/llmenugl.cpp

indra/llui/llresizehandle.cpp

indra/llui/llscrollcontainer.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltextbase.cpp

indra/llui/lluictrl.cpp

indra/llui/llurlentry.cpp

indra/llui/tests/llurlentry_test.cpp

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h