summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-04-30 21:52:55 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-04-30 22:11:34 +0300
commita6b3b98e52d0f4a4b8376596a331613466131a89 (patch)
treea0c1b9cb1a8688a00620112090c023adbf2828f5 /indra/newview
parent9634bcf488f45675e53a761808f59881b57cbe8c (diff)
SL-12898 Added https to allowed audio links
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerparcelmgr.cpp3
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());