Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public

indra/llcommon/stdenums.h

indra/llrender/llfontgl.cpp

indra/llrender/llrender.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llsdparam.cpp

indra/llui/llsdparam.h

indra/llui/lluictrlfactory.cpp

indra/llui/lluistring.cpp

indra/llui/lluistring.h

indra/llxuixml/llinitparam.h

indra/llxuixml/llxuiparser.cpp

indra/llxuixml/llxuiparser.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/ignorable_dialogs.xml

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llbottomtray.cpp