summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-05-07 12:46:04 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-05-07 12:46:04 +0300
commit4769fbbea1f75c4f7bb42da8f29064fe26ff9e01 (patch)
tree35920243850f5659336c4dacb86dae5777102db0 /indra/newview
parente92e72ff3a2c0d0d95cb866f9567a2146bc8dbfa (diff)
MAINT-899 FIXED Handle location url on aditi grid same as on main grid.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llurllineeditorctrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp
index cad5769042..8a61114852 100755
--- a/indra/newview/llurllineeditorctrl.cpp
+++ b/indra/newview/llurllineeditorctrl.cpp
@@ -84,7 +84,7 @@ 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 (LLStringUtil::startsWith(unescaped_text, "http://") || LLStringUtil::startsWith(unescaped_text, "secondlife://")) // SLURL
text_to_copy = utf8str_to_wstring(LLWeb::escapeURL(unescaped_text));
else // human-readable location
text_to_copy = utf8str_to_wstring(unescaped_text);