1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 8477bd3044..c29c9a4919 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -172,6 +172,18 @@ namespace
                                     << '/' << loc.mV[1]
                                     << '/' << loc.mV[2])));
             }
+
+            if (!LLAppViewer::instance()->isSecondInstance())
+            {
+                std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
+                if (!LLAPRFile::isExist(error_marker_file, NULL, LL_APR_RB))
+                {
+                    // If marker doesn't exist, create a marker with 'other' code for next launch
+                    // otherwise don't override existing file
+                    // Any unmarked crashes will be considered as freezes
+                    LLAppViewer::instance()->createErrorMarker(LAST_EXEC_OTHER_CRASH);
+                }
+            }
         } // MDSCB_EXCEPTIONCODE
 
         return false;