Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

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