summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-01-06 11:14:58 -0500
committerOz Linden <oz@lindenlab.com>2015-01-06 11:14:58 -0500
commit7205dbdbe40abacc452aa1e77b597954203f71a5 (patch)
tree6107a847b405acb1ca63d21d6be97acd0b56515c /indra/newview
parent29ccfc46b5c29368c0437131f5ac6c719fa841b6 (diff)
parent21a36e2c5b9dc98a1eca4a00088ea89f914d15b4 (diff)
merge changes for MAINT-4677
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llpanelprofile.cpp2
1 files changed, 1 insertions, 1 deletions
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);