diff options
| author | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
|---|---|---|
| committer | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
| commit | 25de7377c1f6cc2fa6f217b9e9eaca84ab36748d (patch) | |
| tree | ea1770b154433082dbcf06da043c0c3a45f7c5f3 /indra/newview/llappviewer.cpp | |
| parent | 2d9afdaa03f0d44d05e3f2fb9d99dd5b059a9cac (diff) | |
QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8c7af9ebf7..04daf7ceb7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -252,7 +252,6 @@ BOOL gGodConnect = FALSE; BOOL gAcceptTOS = FALSE; BOOL gAcceptCriticalMessage = FALSE; -LLUUID gViewerDigest; // MD5 digest of the viewer's executable file. eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL; LLSD gDebugInfo; @@ -1014,8 +1013,12 @@ bool LLAppViewer::init() // Build a string representing the current version number. gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD ); - + // + // Various introspection concerning the libs we're using. + // + llinfos << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << llendl; + // Merge with the command line overrides gSavedSettings.applyOverrides(gCommandLineSettings); @@ -1248,17 +1251,6 @@ bool LLAppViewer::init() // Load Custom bindings (override defaults) gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini").c_str()); - // Calculate the digest for the executable (takes < 90ms on a fast machine). - FILE* app_file = LLFile::fopen( gDirUtilp->getExecutablePathAndName().c_str(), "rb" ); /* Flawfinder: ignore */ - if( app_file ) - { - LLMD5 app_md5; - app_md5.update( app_file ); // Automatically closes the file - app_md5.finalize(); - app_md5.raw_digest( gViewerDigest.mData ); - } - llinfos << "Viewer Digest: " << gViewerDigest << llendl; - // If we don't have the right GL requirements, exit. if (!gGLManager.mHasRequirements && !gNoRender) { @@ -1368,7 +1360,7 @@ bool LLAppViewer::mainLoop() gViewerWindow->mWindow->gatherInput(); } -#if 1 && !RELEASE_FOR_DOWNLOAD +#if 1 && !LL_RELEASE_FOR_DOWNLOAD // once per second debug info if (debugTime.getElapsedTimeF32() > 1.f) { |