Automated merge avp->avp

indra/llcommon/llsd.cpp

indra/llcommon/llsd.h

indra/llmessage/llareslistener.cpp

indra/llui/llflatlistview.cpp

indra/llui/llfloaterreglistener.cpp

indra/llui/llnotifications.cpp

indra/newview/llagentwearables.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llchathistory.cpp

indra/newview/llcurrencyuimanager.cpp

indra/newview/lleventnotifier.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloatermediasettings.cpp

indra/newview/llfloatermediasettings.h

indra/newview/llfloatertestinspectors.cpp

indra/newview/llfloaterwhitelistentry.cpp

indra/newview/llgroupactions.cpp

indra/newview/llgrouplist.cpp

indra/newview/lllocationinputctrl.cpp

indra/newview/llmaniptranslate.cpp