diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-06 11:14:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-06 11:14:58 -0500 |
| commit | 7205dbdbe40abacc452aa1e77b597954203f71a5 (patch) | |
| tree | 6107a847b405acb1ca63d21d6be97acd0b56515c /indra | |
| parent | 29ccfc46b5c29368c0437131f5ac6c719fa841b6 (diff) | |
| parent | 21a36e2c5b9dc98a1eca4a00088ea89f914d15b4 (diff) | |
merge changes for MAINT-4677
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llurlaction.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llpanelprofile.cpp | 2 |
2 files changed, 2 insertions, 2 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)); } } diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index f91c4110c0..e795e7eedb 100755 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -168,7 +168,7 @@ public: { if (params.size() > 2) { - const std::string object_name = params[2].asString(); + const std::string object_name = LLURI::unescape(params[2].asString()); LLMute mute(avatar_id, object_name, LLMute::OBJECT); LLMuteList::getInstance()->add(mute); LLPanelBlockedList::showPanelAndSelect(mute.mID); |