diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-18 19:25:54 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-18 19:25:54 +0100 |
| commit | c0413250b7e6820b03288bf3bcb035b892870532 (patch) | |
| tree | 2caad0268e3182e198e7c1fc1564c897ba8c130c /indra/newview/llpanelnearbymedia.cpp | |
| parent | 56541379559c61406a4ab322b83be582ecae7806 (diff) | |
| parent | 64b3473f4920b0340e731e44342e2599ad46d698 (diff) | |
Merge 5.1.5
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 737ae2e32d..d8ef5b39ad 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -526,6 +526,7 @@ void LLPanelNearByMedia::removeListItem(const LLUUID &id) if (NULL == mMediaList) return; mMediaList->deleteSingleItem(mMediaList->getItemIndex(id)); + mMediaList->updateLayout(); } void LLPanelNearByMedia::refreshParcelItems() @@ -1047,7 +1048,7 @@ void LLPanelNearByMedia::updateControls() else { showBasicControls(!impl->isMediaDisabled(), ! impl->isParcelMedia(), // include_zoom - LLViewerMediaFocus::getInstance()->isZoomed(), + LLViewerMediaFocus::getInstance()->isZoomedOnMedia(impl->getMediaTextureID()), impl->getVolume() == 0.0, impl->getVolume()); } |