Add uuid to mac crash report

indra/newview/llappviewermacosx-objc.h

@@ -31,6 +31,7 @@
 #include <vector>
 
 //Why?  Because BOOL
+void setCrashUserMetadataWrapper(const std::string& userid, const std::string& username);
 void launchApplication(const std::string* app_name, const std::vector<std::string>* args);
 
 #endif // LL_LLAPPVIEWERMACOSX_OBJC_H

indra/newview/llappviewermacosx-objc.mm

@@ -33,6 +33,20 @@
 
 #include "llappviewermacosx-objc.h"
 
+#if defined(USE_SENTRY)
+#import "Sentry.h"
+#endif
+
+void setCrashUserMetadataWrapper(const std::string& userid, const std::string& username)
+{
+#if defined(USE_SENTRY)
+    SentryUser *user = [[SentryUser alloc] init];
+    user.userId = @(userid.c_str());
+    user.username = @(username.c_str());
+    [SentrySDK setUser:user];
+#endif
+}
+
 void launchApplication(const std::string* app_name, const std::vector<std::string>* args)
 {
     @autoreleasepool

indra/newview/llappviewermacosx.cpp

@@ -227,6 +227,11 @@ bool LLAppViewerMacOSX::init()
     return success;
 }
 
+void LLAppViewerMacOSX::setCrashUserMetadata(const LLUUID& user_id, const std::string& avatar_name)
+{
+    setCrashUserMetadataWrapper(user_id.asString(), avatar_name);
+}
+
 // MacOSX may add and addition command line arguement for the process serial number.
 // The option takes a form like '-psn_0_12345'. The following method should be able to recognize
 // and either ignore or return a pair of values for the option.

indra/newview/llappviewermacosx.h

@@ -31,23 +31,25 @@
 #include "llappviewer.h"
 #endif
 
-class LLAppViewerMacOSX : public LLAppViewer
+class LLAppViewerMacOSX final : public LLAppViewer
 {
 public:
 	LLAppViewerMacOSX();
-	virtual ~LLAppViewerMacOSX();
+    ~LLAppViewerMacOSX() override;
 
 	//
 	// Main application logic
 	//
-	virtual bool init();			// Override to do application initialization
+    bool init();			// Override to do application initialization
 
+    void setCrashUserMetadata(const LLUUID& user_id, const std::string& avatar_name) override;
+    
 protected:
-	virtual bool restoreErrorTrap();
-	virtual void initCrashReporting(bool reportFreeze);
+    bool restoreErrorTrap() override;
+    void initCrashReporting(bool reportFreeze) override;
 
 	std::string generateSerialNumber();
-	virtual bool initParseCommandLine(LLCommandLineParser& clp);
+    bool initParseCommandLine(LLCommandLineParser& clp) override;
 };
 
 #endif // LL_LLAPPVIEWERMACOSX_H