diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-29 07:04:30 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-29 07:04:50 +0800 |
| commit | 2ec9d7fa779456112f36e963d1e169a71149662a (patch) | |
| tree | d1b8282465b30cc67b60b5453b759b3405bf9a31 /indra/newview/llappviewer.h | |
| parent | 863e56d24c06e055d3ba4695422b604cbcd46350 (diff) | |
| parent | b7d33485406150bf466f61477cfd33d9bdacb705 (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index bafe952659..3b6488dade 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -251,6 +251,12 @@ public: // Note: mQuitRequested can be aborted by user. void outOfMemorySoftQuit(); +#ifdef LL_DISCORD + static void initDiscordSocial(); + static void handleDiscordSocial(const LLSD& value); + static void updateDiscordActivity(); +#endif + protected: virtual bool initWindow(); // Initialize the viewer's window. virtual void initLoggingAndGetLastDuration(); // Initialize log files, logging system |