diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-02 06:56:07 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-02 06:56:07 +0800 |
| commit | 51743334b81e5aa4be59417a80149d5f416b51f3 (patch) | |
| tree | 5600f9f58389fe31b71e570bac7867d991408cf1 /indra/newview/llviewermessage.cpp | |
| parent | cb759bf9e0580b0c0799e33b8e7af1ea46a4c336 (diff) | |
| parent | 7588afc86a016c00e6263284bc0db6d684c43895 (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d6f1b96a7b..86bd11d1eb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3073,7 +3073,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) } #ifdef LL_DISCORD - LLAppViewer::updateDiscordActivity(); + if (gSavedSettings.getBOOL("EnableDiscord")) + LLAppViewer::updateDiscordActivity(); #endif if ( LLTracker::isTracking(NULL) ) |