diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 16:59:20 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 16:59:20 -0700 |
| commit | 6a1fefac22b62c45542208928918e9616e85977c (patch) | |
| tree | c85c576b93754ec67ac5e93884b2fd26af192325 /indra/newview/llurllineeditorctrl.cpp | |
| parent | f423a69864c40f760c1c7e64a2e544fd1dba77fb (diff) | |
| parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) | |
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
Diffstat (limited to 'indra/newview/llurllineeditorctrl.cpp')
| -rw-r--r-- | indra/newview/llurllineeditorctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp index 8488527185..333f682e8f 100644 --- a/indra/newview/llurllineeditorctrl.cpp +++ b/indra/newview/llurllineeditorctrl.cpp @@ -89,9 +89,10 @@ void LLURLLineEditor::copyEscapedURLToClipboard() const std::string unescaped_text = wstring_to_utf8str(mText.getWString().substr(left_pos, length)); LLWString text_to_copy; - if (LLSLURL(unescaped_text).isValid()) + // *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://")) // SLURL text_to_copy = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text)); - else + else // human-readable location text_to_copy = utf8str_to_wstring(unescaped_text); gClipboard.copyFromString( text_to_copy ); |