diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-15 12:31:08 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-15 12:31:08 -0700 |
| commit | 5d85dad85f07ea23b3a2892276d8ac591a966864 (patch) | |
| tree | 97aa94cc757e24239f8b13c0cedb3e4a543fff06 /indra/newview/llurllineeditorctrl.cpp | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
Reverted changeset 2bb10eae42bf
Diffstat (limited to 'indra/newview/llurllineeditorctrl.cpp')
| -rw-r--r-- | indra/newview/llurllineeditorctrl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp index 333f682e8f..8488527185 100644 --- a/indra/newview/llurllineeditorctrl.cpp +++ b/indra/newview/llurllineeditorctrl.cpp @@ -89,10 +89,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://")) // SLURL + if (LLSLURL(unescaped_text).isValid()) text_to_copy = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text)); - else // human-readable location + else text_to_copy = utf8str_to_wstring(unescaped_text); gClipboard.copyFromString( text_to_copy ); |