Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues.
Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm