merge -r 58285:58437 maintenance.

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/newview/llagent.cpp

indra/newview/llfloaterland.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanelclassified.cpp

indra/newview/llstatusbar.cpp

indra/newview/lltoolpie.cpp

indra/newview/lltoolpie.h

indra/newview/lltoolselect.cpp

indra/newview/lltoolselect.h

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp