Merge branch 'DRTVWR-596' into davep/SL-20611

indra/llprimitive/lldaeloader.cpp

indra/llprimitive/llmodel.cpp

indra/llrender/llgltexture.cpp

indra/llrender/llgltexture.h

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatersnapshot.h

indra/newview/llinventorygallery.cpp

indra/newview/llinventorygallery.h

indra/newview/llmaterialeditor.cpp

indra/newview/llpanelface.cpp

indra/newview/llpanelvolume.cpp

indra/newview/llsnapshotlivepreview.cpp

indra/newview/lltexturectrl.cpp

indra/newview/lltexturectrl.h

indra/newview/llthumbnailctrl.cpp

indra/newview/llthumbnailctrl.h

indra/newview/llviewerdisplay.cpp

indra/newview/llviewermenufile.cpp