diff options
author | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-07-30 11:09:00 -0400 |
commit | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (patch) | |
tree | e2d49a6fe81f8fd9f0e8793112830d7b17d9068d /indra/llui/llurlaction.cpp | |
parent | f46526b16004e734d0a459e482ab9bb5df656c54 (diff) | |
parent | 94744d4e5ec1bb8dfafa2c459ebc8fbf0b92a68a (diff) |
merge changes for other open sourc contributions
Diffstat (limited to 'indra/llui/llurlaction.cpp')
-rwxr-xr-x | indra/llui/llurlaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp index 12537d9dd1..c28dbb8577 100755 --- a/indra/llui/llurlaction.cpp +++ b/indra/llui/llurlaction.cpp @@ -227,6 +227,6 @@ void LLUrlAction::blockObject(std::string url) std::string object_name = getObjectName(url); if (LLUUID::validate(object_id)) { - executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name); + executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + LLURI::escape(object_name)); } } |