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

indra/llrender/llfontfreetype.cpp

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llhandle.h

indra/llui/llmenugl.h

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/lluictrl.cpp

indra/llui/lluictrl.h

indra/llui/llview.h

indra/llui/tests/llurlentry_stub.cpp

indra/llui/tests/llurlmatch_test.cpp

indra/llxuixml/llinitparam.cpp

indra/llxuixml/llinitparam.h

indra/llxuixml/llxuiparser.cpp

indra/newview/llfloatercamera.cpp

indra/newview/llfloaterwebcontent.cpp

indra/newview/llfloaterwebcontent.h

indra/newview/llnavigationbar.cpp