diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-30 22:22:36 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-30 22:22:36 +0800 |
| commit | 0146a8b3119e2c6c652dd7b608de9efcdbd3fd50 (patch) | |
| tree | e275801560f45a2495a07e2e63e7bf01bd3f4224 | |
| parent | b929c7f6fd5260d8442b57c9027cbdd8556b4a84 (diff) | |
Update Discord Activity only when integration is enabled
No need to check setting for the status change callback one,
because getting there would need to be connected to Discord first,
which in turn needs the integration to be enabled first.
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llspeakers.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index da7f524146..bf2462d7d9 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -844,7 +844,8 @@ void LLPanelPeople::updateNearbyList() LLWorld::getInstance()->getAvatars(&mNearbyList->getIDs(), &positions, gAgent.getPositionGlobal(), gSavedSettings.getF32("MPVNearMeRange")); mNearbyList->setDirty(); #ifdef LL_DISCORD - LLAppViewer::updateDiscordPartyMaxSize(mNearbyList->getIDs().size()); + if (gSavedSettings.getBOOL("EnableDiscord")) + LLAppViewer::updateDiscordPartyMaxSize(mNearbyList->getIDs().size()); #endif DISTANCE_COMPARATOR.updateAvatarsPositions(positions, mNearbyList->getIDs()); diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 46a88ba512..12a9d5e9b7 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -1027,7 +1027,8 @@ void LLLocalSpeakerMgr::updateSpeakerList() std::vector<LLVector3d> positions; LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, gAgent.getPositionGlobal(), CHAT_NORMAL_RADIUS); #ifdef LL_DISCORD - LLAppViewer::updateDiscordPartyCurrentSize(avatar_ids.size()); + if (gSavedSettings.getBOOL("EnableDiscord")) + LLAppViewer::updateDiscordPartyCurrentSize(avatar_ids.size()); #endif for(U32 i=0; i<avatar_ids.size(); i++) { 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) ) |