Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer

indra/llprimitive/llmaterial.cpp

indra/llprimitive/llmaterial.h

indra/newview/app_settings/settings.xml

indra/newview/llmaterialeditor.cpp

indra/newview/llmaterialeditor.h

indra/newview/llpanelface.cpp

indra/newview/llpanelface.h

indra/newview/llpreview.cpp

indra/newview/llpreview.h

indra/newview/llselectmgr.cpp

indra/newview/llselectmgr.h

indra/newview/lltooldraganddrop.cpp

indra/newview/llviewerinventory.cpp

indra/newview/llviewerinventory.h

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

indra/newview/skins/default/xui/en/notifications.xml

indra/newview/skins/default/xui/en/panel_tools_texture.xml