merge changes from product-engine

indra/llui/llfloaterreg.cpp

indra/llui/lliconctrl.cpp

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llcallingcard.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/lllandmarkactions.cpp

indra/newview/lllandmarkactions.h

indra/newview/lllocationinputctrl.cpp

indra/newview/lllocationinputctrl.h

indra/newview/llnearbychathandler.cpp

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelimcontrolpanel.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelplaceinfo.cpp