diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-12-12 11:57:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-12 11:57:07 -0800 |
| commit | 24bb1e58f87bbc42ec006d1eb107091c709b6de3 (patch) | |
| tree | 99031882ec6fd39473d8b67f5cb06f8d38d8be2f /indra/newview/llurllineeditorctrl.cpp | |
| parent | 43341b7aa9c883066c6d31da929cc30732da66f9 (diff) | |
| parent | f4eec813a3043e2277ae62da6a829c65887d0785 (diff) | |
Merge branch 'develop' into rider/privileged_land
Diffstat (limited to 'indra/newview/llurllineeditorctrl.cpp')
| -rw-r--r-- | indra/newview/llurllineeditorctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp index de0ed645eb..871bf36ed3 100644 --- a/indra/newview/llurllineeditorctrl.cpp +++ b/indra/newview/llurllineeditorctrl.cpp @@ -84,7 +84,9 @@ void LLURLLineEditor::copyEscapedURLToClipboard() const std::string unescaped_text = wstring_to_utf8str(mText.getWString().substr(left_pos, length)); LLWString text_to_copy; // *HACK: Because LLSLURL is currently broken we cannot use it to check if unescaped_text is a valid SLURL (see EXT-8335). - if (LLStringUtil::startsWith(unescaped_text, "http://") || LLStringUtil::startsWith(unescaped_text, "secondlife://")) // SLURL + if (LLStringUtil::startsWith(unescaped_text, "https://") + || LLStringUtil::startsWith(unescaped_text, "http://") + || LLStringUtil::startsWith(unescaped_text, "secondlife://")) // SLURL text_to_copy = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text)); else // human-readable location text_to_copy = utf8str_to_wstring(unescaped_text); |