automated merge

indra/llui/llmenugl.cpp

indra/newview/app_settings/settings.xml

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.h

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llfolderview.cpp

indra/newview/llinventoryitemslist.cpp

indra/newview/llinventoryitemslist.h

indra/newview/llinventoryobserver.cpp

indra/newview/llinventoryobserver.h

indra/newview/llnearbychatbar.cpp

indra/newview/llnearbychatbar.h

indra/newview/lloutfitslist.cpp

indra/newview/lloutfitslist.h

indra/newview/llpanelgroupgeneral.cpp

indra/newview/llpanelgroupgeneral.h

indra/newview/llpanelgrouproles.cpp