1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index efcbaf42e8..a9b9bfafa8 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -170,7 +170,7 @@ public:
     static U32 sMaxGLTFNodes;
 
     static void initProfile();
-    static void finishProfile(const std::string& report_name={});
+    static void finishProfile(const std::string& report_name=sDefaultReportName);
 
     static void startProfile();
     static void stopProfile();
@@ -364,6 +364,11 @@ public:
 
 private:
     void unloadInternal();
+    // This must be static because finishProfile() is called at least once
+    // within a __try block. If we default its report_name parameter to a
+    // temporary std::string, that temporary must be destroyed when the stack
+    // is unwound, which __try forbids.
+    static std::string sDefaultReportName;
 };
 
 //UI shader (declared here so llui_libtest will link properly)