Merge from default branch.

indra/llplugin/llpluginprocesschild.cpp

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llcheckboxctrl.cpp

indra/llui/llconsole.cpp

indra/llui/lllineeditor.cpp

indra/llui/llmenubutton.h

indra/llui/llmenugl.cpp

indra/llui/lltextbase.cpp

indra/llwindow/llkeyboardwin32.cpp

indra/llwindow/llwindowwin32.cpp

indra/newview/app_settings/ignorable_dialogs.xml

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llappviewer.cpp

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/lldateutil.cpp