merge changes for storm-1557

indra/llcommon/llsdserialize.cpp

indra/llcommon/llsdserialize_xml.cpp

indra/llcommon/llsys.cpp

indra/llinventory/llinventory.cpp

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocessparent.cpp

indra/llui/llmenubutton.cpp

indra/llui/llmenubutton.h

indra/llui/llview.cpp

indra/newview/llavataractions.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/llfloaterworldmap.h

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llfolderviewitem.h

indra/newview/llinventorypanel.cpp

indra/newview/lllogininstance.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h