merge

indra/llplugin/llpluginsharedmemory.cpp

indra/llplugin/llpluginsharedmemory.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llavatarpropertiesprocessor.cpp

indra/newview/llfloateropenobject.cpp

indra/newview/llfloatertools.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderviewitem.cpp

indra/newview/llfolderviewitem.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryfilter.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h

indra/newview/llmediadataclient.cpp

indra/newview/llmediadataclient.h

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelmediasettingsgeneral.cpp

indra/newview/llpanelmediasettingsgeneral.h