cherrypicking the fix for linux startup issue DEV-33209 - the bug has percolated

around for so long without the fix that I can't stand it any longer.

svn merge -c123659
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-15-sandbox-3