diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:11:13 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-02 23:11:13 +0300 |
| commit | 2571b948298cff82b3e3425c5b6b1c3f56caed45 (patch) | |
| tree | e83f7feefee1febee685e4aaf662e1a91c6e0815 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 353afb48f265822f591eb8d02cacd830e32640bf (diff) | |
| parent | 1702a65665879d0c68df4c6b4fdb60f815ab7abb (diff) | |
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# indra/llaudio/llaudioengine_fmodex.cpp
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()); |