summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelaskplay.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:16:03 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-08-18 19:16:03 +0300
commitcfe0ba90352c48a2b9f5006c4c8e824dc472cdc9 (patch)
tree58515df5648b7a7819b4cb62e88431c1b4747e79 /indra/newview/llviewerparcelaskplay.cpp
parent61e318564e5c492ff7da70ef05f9596c4af8d369 (diff)
parente8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff)
Merge branch 'master' into DRTVWR-515-maint
# Conflicts: # indra/newview/llimprocessing.cpp
Diffstat (limited to 'indra/newview/llviewerparcelaskplay.cpp')
-rw-r--r--indra/newview/llviewerparcelaskplay.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelaskplay.cpp b/indra/newview/llviewerparcelaskplay.cpp
index d4aa783f12..74586dadc3 100644
--- a/indra/newview/llviewerparcelaskplay.cpp
+++ b/indra/newview/llviewerparcelaskplay.cpp
@@ -78,6 +78,8 @@ void LLViewerParcelAskPlay::askToPlay(const LLUUID &region_id, const S32 &parcel
default:
{
// create or re-create notification
+ // Note: will create and immediately cancel one notification if region has both media and music
+ // since ask play does not distinguish media from music and media can be used as music
cancelNotification();
if (LLStartUp::getStartupState() > STATE_PRECACHE)