diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
| commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
| tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/newview/llurllineeditorctrl.cpp | |
| parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
Merge from dessie/viewer-release
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 ); |