diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-02 16:05:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-02 16:05:56 -0400 |
| commit | 50a8c2e41adf92f289fc7c6394908e0b04e130ca (patch) | |
| tree | fdee833b893eac17f04503b4423e681443c7aa0a /indra/newview/llviewerparcelmgr.cpp | |
| parent | 1d8cbec4c8b6fdc09a2772c4bc98732927323570 (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
DRTVWR-476: Merge branch 'master' of bitbucket.org:lindenlab/viewer into d476.
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index e197591ef8..c966b7d4f9 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1902,7 +1902,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use // If there is a new music URL and it's valid, play it. if (music_url.size() > 12) { - if (music_url.substr(0, 7) == "http://") + if (music_url.substr(0, 7) == "http://" + || music_url.substr(0, 8) == "https://") { LLViewerRegion *region = LLWorld::getInstance()->getRegion(msg->getSender()); optionally_start_music(music_url, parcel->mLocalID, region->getRegionID()); |