merge

indra/newview/llavataractions.cpp

indra/newview/llavatariconctrl.cpp

indra/newview/llgroupactions.cpp

indra/newview/llgrouplist.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimpanel.cpp

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llnotificationofferhandler.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llpanelteleporthistory.cpp

indra/newview/llparticipantlist.cpp

indra/newview/llparticipantlist.h

indra/newview/llspeakers.cpp

indra/newview/llspeakers.h

indra/newview/llviewerfloaterreg.cpp