diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-24 14:18:36 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-24 14:18:36 -0800 |
| commit | fe07c1a29cb5e30a49950c4bb74c8130e86cd79b (patch) | |
| tree | 8189786f2b04167d40bd6b513de7cbc2c62bcbea /indra | |
| parent | a31cb50d467815af7231e9e81f10b960af383f50 (diff) | |
| parent | be7a190d6834262b870280b7e1ce45953c5e3fa6 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 75b25b6a40..c02f154dc8 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -574,13 +574,16 @@ void LLPanelNearByMedia::refreshParcelItems() if (NULL != mParcelMediaItem) { std::string name, url, tooltip; - getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, ""); - if (name.empty() || name == url) + if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMedia()) { - tooltip = url; - } - else { - tooltip = name + " : " + url; + getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, ""); + if (name.empty() || name == url) + { + tooltip = url; + } + else { + tooltip = name + " : " + url; + } } LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia(); updateListItem(mParcelMediaItem, @@ -617,9 +620,14 @@ void LLPanelNearByMedia::refreshParcelItems() { bool is_playing = LLViewerMedia::isParcelAudioPlaying(); + std::string url; + if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMusic()) + { + url = LLViewerMedia::getParcelAudioURL(); + } updateListItem(mParcelAudioItem, mParcelAudioName, - LLViewerMedia::getParcelAudioURL(), + url, -1, // Proximity after Parcel Media, but closer than anything else (!is_playing), is_playing, |