summaryrefslogtreecommitdiff
path: root/indra/newview/llurllineeditorctrl.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-13 15:47:32 -0700
committerJames Cook <james@lindenlab.com>2010-05-13 15:47:32 -0700
commit8b524549902b780c2833691368bc35bdb1837cd9 (patch)
treeb742a7f5463fb42663fa51e1029c80671ceb881b /indra/newview/llurllineeditorctrl.cpp
parent14f423a23c38bf554e9633752074fbcabd92599c (diff)
parentaebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff)
merge pull from dessie/viewer-public, picking up SLE code
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 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);