summaryrefslogtreecommitdiff
path: root/indra/newview/llurllineeditorctrl.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-07 14:47:25 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-07 14:47:25 -0400
commit52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch)
treef963815f91b6259ea403d41807d19b69e759897e /indra/newview/llurllineeditorctrl.cpp
parent516ec63f52245a777725d29efe3c35e4e4e72936 (diff)
parent8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff)
automated merge
Diffstat (limited to 'indra/newview/llurllineeditorctrl.cpp')
-rw-r--r--indra/newview/llurllineeditorctrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp
index 8488527185..1d2687a8c2 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(unescaped_text).isValid())
+ if (LLSLURL::isSLURL(unescaped_text))
text_to_copy = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text));
else
text_to_copy = utf8str_to_wstring(unescaped_text);