From c9898f1b69a53cd5d3e7bb49f77a764dde43772e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 19 Jun 2018 09:37:28 -0400
Subject: [PATCH] SL-821: Try again to override BugSplat Obj-C methods.
---
indra/newview/llappdelegate-objc.mm | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 2c2302ecfb3..68b803c367c 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -27,6 +27,9 @@
#import "llappdelegate-objc.h"
#if defined(LL_BUGSPLAT)
@import BugsplatMac;
+// derived from BugsplatMac's BugsplatTester/AppDelegate.m
+@interface LLAppDelegate () <BugsplatStartupManagerDelegate>
+@end
#endif
#include "llwindowmacosx-objc.h"
#include "llappviewermacosx-for-objc.h"
@@ -190,15 +193,14 @@
return true;
}
-@end
-
#if defined(LL_BUGSPLAT)
-// per Geoff at BugSplat support
-@interface AppDelegate : NSObject <NSApplicationDelegate, BugsplatStartupManagerDelegate>
-@end
-
-@implementation AppDelegate
+- (NSString *)applicationLogForBugsplatStartupManager:(BugsplatStartupManager *)bugsplatStartupManager
+{
+// return NSStringFromSelector(_cmd);
+ infos("Reached applicationLogForBugsplatStartupManager");
+ return @"[contents of SecondLife.log]";
+}
- (BugsplatAttachment *)attachmentForBugsplatStartupManager:(BugsplatStartupManager *)bugsplatStartupManager {
std::string logfile = getLogFilePathname();
@@ -219,6 +221,6 @@
return attachment;
}
-@end
-
#endif // LL_BUGSPLAT
+
+@end
--
GitLab