summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-19 09:37:28 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-19 09:37:28 -0400
commitc9898f1b69a53cd5d3e7bb49f77a764dde43772e (patch)
tree429eceb6f8370515e1265e91c23b26ce31b92325 /indra
parent6e790fc27d22e80527789cf8e783be6c90a23505 (diff)
SL-821: Try again to override BugSplat Obj-C methods.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappdelegate-objc.mm20
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 2c2302ecfb..68b803c367 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