diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-12 15:43:56 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-12 15:43:56 +0300 |
commit | 3afa084e220c0e745a90734b0ea2f68730b746bc (patch) | |
tree | a29585f942c9365feed9548c145ff5716ab84514 /indra/newview/llurllineeditorctrl.cpp | |
parent | fbaae0a2df3b68756c7d910438041887d018cd63 (diff) | |
parent | 1cee577ca0234eee7da243c85be8eb7524d691c7 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llurllineeditorctrl.cpp')
-rw-r--r-- | indra/newview/llurllineeditorctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp index 1d2687a8c2..8488527185 100644 --- a/indra/newview/llurllineeditorctrl.cpp +++ b/indra/newview/llurllineeditorctrl.cpp @@ -89,7 +89,7 @@ void LLURLLineEditor::copyEscapedURLToClipboard() const std::string unescaped_text = wstring_to_utf8str(mText.getWString().substr(left_pos, length)); LLWString text_to_copy; - if (LLSLURL::isSLURL(unescaped_text)) + if (LLSLURL(unescaped_text).isValid()) text_to_copy = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text)); else text_to_copy = utf8str_to_wstring(unescaped_text); |