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

indra/llprimitive/llmaterial.cpp

indra/llprimitive/llmaterial.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llfloaterbulkpermission.cpp

indra/newview/llfloaterbulkpermission.h

indra/newview/llfloaternewfeaturenotification.cpp

indra/newview/llfloaternewfeaturenotification.h

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/llstartup.cpp