merge fix for STORM-679

BuildParams

doc/contributions.txt

indra/llcommon/llthread.cpp

indra/llmessage/llcachename.cpp

indra/llui/llcombobox.cpp

indra/llui/lldockcontrol.cpp

indra/llui/llmenubutton.cpp

indra/llui/llmenubutton.h

indra/llui/llscrolllistcolumn.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagent.h

indra/newview/llbottomtray.cpp

indra/newview/llimview.cpp

indra/newview/lllogchat.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpeople.h