From 21a36e2c5b9dc98a1eca4a00088ea89f914d15b4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Nov 2014 12:15:30 +0100
Subject: [PATCH] MAINT-4677: Unexpected behaviour when blocking objects with a
/ in their name when using compact chat view
---
doc/contributions.txt | 1 +
indra/llui/llurlaction.cpp | 2 +-
indra/newview/llpanelprofile.cpp | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2d27562e37a..5ae1306f3cb 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -185,6 +185,7 @@ Ansariel Hiller
BUG-3764
STORM-1984
STORM-1979
+ MAINT-4677
Aralara Rajal
Arare Chantilly
CHUIBUG-191
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
index 12537d9dd18..c28dbb85775 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 f91c4110c0a..e795e7eedb0 100755
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -168,7 +168,7 @@ class LLAgentHandler : public LLCommandHandler
{
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);
--
GitLab