livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-14987 / BUG-7784 / MAINT-4677: Cannot mute objects with slashes in their name via V1 chat history

Ansariel 2014-11-18 11:38:12 +01:00
parent eb6adbd818
commit b7f03802ac
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llurlaction.cpp
View File

@ -227,7 +227,10 @@ 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);
// <FS:Ansariel> FIRE-14987: Cannot mute objects with slashes in their name via V1 chat history
//executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name);
executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + LLURI::escape(object_name));
// </FS:Ansariel>
}
}

5
indra/newview/llpanelprofile.cpp
View File

@ -200,7 +200,10 @@ public:
{
if (params.size() > 2)
{
const std::string object_name = params[2].asString();
// <FS:Ansariel> FIRE-14987: Cannot mute objects with slashes in their name via V1 chat history
//const std::string object_name = params[2].asString();
const std::string object_name = LLURI::unescape(params[2].asString());
// </FS:Ansariel>
LLMute mute(avatar_id, object_name, LLMute::OBJECT);
LLMuteList::getInstance()->add(mute);
LLPanelBlockedList::showPanelAndSelect(mute.mID);