diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-08 18:52:37 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-12-08 18:52:46 +0200 |
| commit | cbe606df6b77780fdecf8bdc4007a52d25ff5722 (patch) | |
| tree | 2bf38de402b8c338bdf5dde5798dcf7d15d9a8da /indra/llprimitive/llmediaentry.cpp | |
| parent | 88a3d951fd15863bfd77b9b7137e9c02c21a4a10 (diff) | |
| parent | 49c73ac7297ec7760a00bf36fa6339f2d0be1f95 (diff) | |
Merge branch 'release/2026.01' into maxim/voice-moderation
# Conflicts:
# indra/newview/llviewerstats.h
Diffstat (limited to 'indra/llprimitive/llmediaentry.cpp')
| -rw-r--r-- | indra/llprimitive/llmediaentry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmediaentry.cpp b/indra/llprimitive/llmediaentry.cpp index b5b17c53aa..48c6ba1fa5 100644 --- a/indra/llprimitive/llmediaentry.cpp +++ b/indra/llprimitive/llmediaentry.cpp @@ -74,7 +74,7 @@ const char* LLMediaEntry::WHITELIST_KEY = MEDIA_WHITELIST_KEY_STR; const char* LLMediaEntry::PERMS_INTERACT_KEY = MEDIA_PERMS_INTERACT_KEY_STR; const char* LLMediaEntry::PERMS_CONTROL_KEY = MEDIA_PERMS_CONTROL_KEY_STR; -#define DEFAULT_URL_PREFIX "http://" +#define DEFAULT_URL_PREFIX "https://" // Constructor(s) LLMediaEntry::LLMediaEntry() : |