diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 17:18:18 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 17:18:18 +0000 |
| commit | 5df284b23a2e7db47cf89de72044fe5d3df1ccf4 (patch) | |
| tree | a543deec1323c4dc1cc42207277d0c47bbebdb66 /indra/newview/llviewerparcelmgr.cpp | |
| parent | b84e79e0f206ac49aa57c4ad2d8d3dd7b5d2fc4d (diff) | |
| parent | ba6a0f3f332ffc659b00ca4c298b96efe56c6b81 (diff) | |
Merged in merge-6.4.4 (pull request #167)
Merge master 6.4.4 into DRTVWR-510
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()); |