diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-05-21 16:47:42 -0700 |
| commit | 0fdbe7e34df55ac92302b4af38c42d03454d3bc1 (patch) | |
| tree | 038c6087299c9096ac7c6606ec45a8339eb0fd72 /indra/newview/llpanelnearbymedia.cpp | |
| parent | 3bf89821d9c9777a0f24d89280bd7a7011a7a3df (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
Merge
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()); } |