From b889c15cddccdfa5dd164388a566e4c63bbdf6f3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Jun 2018 12:57:12 -0400
Subject: [PATCH] SL-821: Fix BugSplat attachment method override per BugSplat
 support.

The example code on the BugSplat documentation page
https://www.bugsplat.com/docs/platforms/os-x#configuration
omits certain essential Objective-C++ boilerplate incantations. Adding them
at least compiles successfully.
---
 indra/newview/llappdelegate-objc.mm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 008203fd321..11a4b5d48e9 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -194,7 +194,11 @@
 
 #if defined(LL_BUGSPLAT)
 
-@implementation BugsplatStartupManagerDelegate
+// per Geoff at BugSplat support
+@interface AppDelegate : NSObject <NSApplicationDelegate, BugsplatStartupManagerDelegate>
+@end
+
+@implementation AppDelegate
 
 - (BugsplatAttachment *)attachmentForBugsplatStartupManager:(BugsplatStartupManager *)bugsplatStartupManager {
     std::string logfile = getLogFilePathname();
-- 
GitLab