Merge branch 'develop' into geenz/2025.07-lua-editor

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 6386d0636a..a951338138 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -172,6 +172,15 @@ namespace
                                     << '/' << loc.mV[1]
                                     << '/' << loc.mV[2])));
             }
+
+            LLAppViewer* app = LLAppViewer::instance();
+            if (!app->isSecondInstance() && !app->errorMarkerExists())
+            {
+                // 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
+                app->createErrorMarker(LAST_EXEC_OTHER_CRASH);
+            }
         } // MDSCB_EXCEPTIONCODE
 
         return false;