merge -r 58503:58641 maintenance -> release

indra/llcommon/llpreprocessor.h

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llmenugl.cpp

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/llchatbar.cpp

indra/newview/lldynamictexture.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloaterimagepreview.cpp

indra/newview/llfolderview.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llpreview.cpp

indra/newview/llpreviewtexture.cpp

indra/newview/llselectmgr.cpp

indra/newview/llstartup.cpp

indra/newview/lltoolfocus.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llviewerwindow.h