diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-09 11:24:54 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-09 11:24:54 -0500 |
| commit | c8293e29caf4701f130141a88b90709a09143d4e (patch) | |
| tree | fc84848355f3c5d21e3fd6dd1ba2c5eade2d8c03 /indra/newview/llpanelnearbymedia.cpp | |
| parent | 94b0ce6d842a1f34bd46535a8b4db68aa397a541 (diff) | |
| parent | 76a325b83271424d231561d8ef099df1406c9517 (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
| -rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index fc6bc09b82..2bbd15ae11 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -564,16 +564,14 @@ void LLPanelNearByMedia::refreshParcelItems() if (NULL != mParcelMediaItem) { std::string name, url, tooltip; - if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMedia()) + getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, ""); + if (name.empty() || name == url) { - getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, ""); - if (name.empty() || name == url) - { - tooltip = url; - } - else { - tooltip = name + " : " + url; - } + tooltip = url; + } + else + { + tooltip = name + " : " + url; } LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia(); updateListItem(mParcelMediaItem, @@ -611,10 +609,8 @@ void LLPanelNearByMedia::refreshParcelItems() bool is_playing = LLViewerMedia::isParcelAudioPlaying(); std::string url; - if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMusic()) - { - url = LLViewerMedia::getParcelAudioURL(); - } + url = LLViewerMedia::getParcelAudioURL(); + updateListItem(mParcelAudioItem, mParcelAudioName, url, |