Skip to content
Snippets Groups Projects
Commit 21a36e2c authored by Ansariel's avatar Ansariel
Browse files

MAINT-4677: Unexpected behaviour when blocking objects with a / in their name...

MAINT-4677: Unexpected behaviour when blocking objects with a / in their name when using compact chat view
parent 2301cf80
No related branches found
No related tags found
No related merge requests found
...@@ -185,6 +185,7 @@ Ansariel Hiller ...@@ -185,6 +185,7 @@ Ansariel Hiller
BUG-3764 BUG-3764
STORM-1984 STORM-1984
STORM-1979 STORM-1979
MAINT-4677
Aralara Rajal Aralara Rajal
Arare Chantilly Arare Chantilly
CHUIBUG-191 CHUIBUG-191
......
...@@ -227,6 +227,6 @@ void LLUrlAction::blockObject(std::string url) ...@@ -227,6 +227,6 @@ void LLUrlAction::blockObject(std::string url)
std::string object_name = getObjectName(url); std::string object_name = getObjectName(url);
if (LLUUID::validate(object_id)) 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));
} }
} }
...@@ -168,7 +168,7 @@ public: ...@@ -168,7 +168,7 @@ public:
{ {
if (params.size() > 2) 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); LLMute mute(avatar_id, object_name, LLMute::OBJECT);
LLMuteList::getInstance()->add(mute); LLMuteList::getInstance()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID); LLPanelBlockedList::showPanelAndSelect(mute.mID);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment