diff options
author | Aleric Inglewood | 2010-10-23 14:35:58 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-23 14:35:58 +0200 |
commit | f82cceee28ee311f2a449b6270b449e3918764ec (patch) | |
tree | 31ef436f57b975e650f08fce77d31143ec11e672 | |
parent | Fix the errors "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" at s... (diff) | |
parent | MP-660: Incorrect start up warnings (diff) | |
download | meta-impy-f82cceee28ee311f2a449b6270b449e3918764ec.zip meta-impy-f82cceee28ee311f2a449b6270b449e3918764ec.tar.gz meta-impy-f82cceee28ee311f2a449b6270b449e3918764ec.tar.bz2 meta-impy-f82cceee28ee311f2a449b6270b449e3918764ec.tar.xz |
Merge branch 'weekly' into webkit_plugins
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 545b7e4..536092c 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -2716,35 +2716,32 @@ void LLAppViewer::initMarkerFile() | |||
2716 | std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME); | 2716 | std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME); |
2717 | std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME); | 2717 | std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME); |
2718 | 2718 | ||
2719 | |||
2720 | if (LLAPRFile::isExist(mMarkerFileName, LL_APR_RB) && !anotherInstanceRunning()) | 2719 | if (LLAPRFile::isExist(mMarkerFileName, LL_APR_RB) && !anotherInstanceRunning()) |
2721 | { | 2720 | { |
2722 | gLastExecEvent = LAST_EXEC_FROZE; | 2721 | gLastExecEvent = LAST_EXEC_FROZE; |
2723 | LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL; | 2722 | LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL; |
2724 | } | 2723 | } |
2725 | |||
2726 | if(LLAPRFile::isExist(logout_marker_file, LL_APR_RB)) | 2724 | if(LLAPRFile::isExist(logout_marker_file, LL_APR_RB)) |
2727 | { | 2725 | { |
2728 | LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << LL_ENDL; | ||
2729 | gLastExecEvent = LAST_EXEC_LOGOUT_FROZE; | 2726 | gLastExecEvent = LAST_EXEC_LOGOUT_FROZE; |
2727 | LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL; | ||
2728 | LLAPRFile::remove(logout_marker_file); | ||
2730 | } | 2729 | } |
2731 | if(LLAPRFile::isExist(llerror_marker_file, LL_APR_RB)) | 2730 | if(LLAPRFile::isExist(llerror_marker_file, LL_APR_RB)) |
2732 | { | 2731 | { |
2733 | llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl; | ||
2734 | if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH; | 2732 | if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH; |
2735 | else gLastExecEvent = LAST_EXEC_LLERROR_CRASH; | 2733 | else gLastExecEvent = LAST_EXEC_LLERROR_CRASH; |
2734 | LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL; | ||
2735 | LLAPRFile::remove(llerror_marker_file); | ||
2736 | } | 2736 | } |
2737 | if(LLAPRFile::isExist(error_marker_file, LL_APR_RB)) | 2737 | if(LLAPRFile::isExist(error_marker_file, LL_APR_RB)) |
2738 | { | 2738 | { |
2739 | LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << LL_ENDL; | ||
2740 | if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH; | 2739 | if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH; |
2741 | else gLastExecEvent = LAST_EXEC_OTHER_CRASH; | 2740 | else gLastExecEvent = LAST_EXEC_OTHER_CRASH; |
2741 | LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL; | ||
2742 | LLAPRFile::remove(error_marker_file); | ||
2742 | } | 2743 | } |
2743 | 2744 | ||
2744 | LLAPRFile::remove(logout_marker_file); | ||
2745 | LLAPRFile::remove(llerror_marker_file); | ||
2746 | LLAPRFile::remove(error_marker_file); | ||
2747 | |||
2748 | // No new markers if another instance is running. | 2745 | // No new markers if another instance is running. |
2749 | if(anotherInstanceRunning()) | 2746 | if(anotherInstanceRunning()) |
2750 | { | 2747 | { |