diff options
author | AtlasLinden <114031241+AtlasLinden@users.noreply.github.com> | 2025-08-06 09:42:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-08-06 09:42:26 -0400 |
commit | e4a25dc5b97cd939e6a5ddc8275a728075768a52 (patch) | |
tree | ef39a05be37eae43e34d5c1e5ab081aa208b0ebd /indra/newview/llviewermessage.cpp | |
parent | 9311b522d8979cfe6e7a751f9447df8e0c3d1e96 (diff) | |
parent | 819817f5c9cebad353f5b86996b5426095dd73b8 (diff) |
Merge branch 'develop' into atlas-qaworkflow
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 7b9331e822..44831aea03 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3052,6 +3052,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 |