Merged in maxim_productengine/viewer-eep2 (pull request #67)

MAINT-9064 One more fix for crash caused by new shader calls

Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>