diff options
| author | Karen Lahey <karina@lindenlab.com> | 2009-10-15 16:52:03 -0700 |
|---|---|---|
| committer | Karen Lahey <karina@lindenlab.com> | 2009-10-15 16:52:03 -0700 |
| commit | 73e86b0bed548b2aaba8d92837e562d6d753808a (patch) | |
| tree | ee77d1f79fee430bb64c61d89988a0cb07ecf257 /indra/newview/llappviewer.cpp | |
| parent | 7ab41a8a815968e274ebbfc459328be40cf5479a (diff) | |
MAC Address Change no longer causes viewer to die cr:Roxie
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 187038ab15..c2f8487aa9 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -620,8 +620,6 @@ bool LLAppViewer::init() LLCurl::initClass(); initThreads(); - initializeSecHandler(); - LLHTTPClient::setCertVerifyCallback(secapiSSLCertVerifyCallback); writeSystemInfo(); // Build a string representing the current version number. @@ -862,6 +860,7 @@ bool LLAppViewer::init() } } + // save the graphics card gDebugInfo["GraphicsCard"] = LLFeatureManager::getInstance()->getGPUString(); @@ -872,6 +871,17 @@ bool LLAppViewer::init() gSimFrames = (F32)gFrameCount; LLViewerJoystick::getInstance()->init(false); + + try { + initializeSecHandler(); + } + catch (LLProtectedDataException ex) + { + LLNotificationsUtil::add("CorruptedProtectedDataStore"); + } + LLHTTPClient::setCertVerifyCallback(secapiSSLCertVerifyCallback); + + gGLActive = FALSE; if (gSavedSettings.getBOOL("QAMode") && gSavedSettings.getS32("QAModeEventHostPort") > 0) { |