diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2023-08-17 13:05:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-17 13:05:14 -0400 |
| commit | 9d981c72f8d098baeae9e9fa1e3c4737f957bbe2 (patch) | |
| tree | e041df46ca357f3071b4c9c7a0799090c45669a6 /indra/newview/llpanelnearbymedia.cpp | |
| parent | e06cdc329a83b4c1e52eaf39b4b030763b7d8568 (diff) | |
| parent | 6cf6f81ae865d4e15b715a93408c7970b6936ce8 (diff) | |
Merge pull request #332 from secondlife/DRTVWR-588-monterey
Remove unused counters that cause fatal warnings
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 02911313ed..3c3cd5d522 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -619,7 +619,6 @@ void LLPanelNearByMedia::refreshList() LLViewerMedia::impl_list impls = media_inst->getPriorityList(); LLViewerMedia::impl_list::iterator priority_iter; - U32 enabled_count = 0; U32 disabled_count = 0; // iterate over the impl list, creating rows as necessary. @@ -662,13 +661,10 @@ void LLPanelNearByMedia::refreshList() { disabled_count++; } - else { - enabled_count++; } } - } mDisableAllCtrl->setEnabled((gSavedSettings.getBOOL("AudioStreamingMusic") || - gSavedSettings.getBOOL("AudioStreamingMedia")) && + gSavedSettings.getBOOL("AudioStreamingMedia")) && (media_inst->isAnyMediaShowing() || media_inst->isParcelMediaPlaying() || media_inst->isParcelAudioPlaying())); |