diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 06:56:08 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 06:56:08 +0800 |
| commit | 3b776461127f193298018cbe1bbeb92478cca485 (patch) | |
| tree | a29eae4a01e9b5d44eb794be0acb3138ee6db35f /indra/newview/llviewermessage.cpp | |
| parent | 59ac767bd43027ce6fc132c1f09aea4af4c1f85f (diff) | |
| parent | 9dee879a8b3b904f4332d3cacfe110615a217681 (diff) | |
Merge branch 'main' into 2025.06
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 47d7d42bf7..86bd11d1eb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3072,6 +3072,11 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) } } +#ifdef LL_DISCORD + if (gSavedSettings.getBOOL("EnableDiscord")) + LLAppViewer::updateDiscordActivity(); +#endif + if ( LLTracker::isTracking(NULL) ) { // Check distance to beacon, if < 5m, remove beacon |