Merge from v2 trunk.

indra/llcommon/lldictionary.h

indra/llcommon/llerrorlegacy.h

indra/llcommon/llfoldertype.cpp

indra/llimage/llimage.cpp

indra/llmessage/llcurl.cpp

indra/llmessage/llcurl.h

indra/llmessage/llhttpclient.cpp

indra/llmessage/llurlrequest.cpp

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llfloater.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/newview/app_settings/keywords.ini

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llappviewer.cpp

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp