diff options
author | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
commit | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (patch) | |
tree | 40918499d2a59dcbbac51f7d24930c174537fe27 /indra/newview/llpanelprofile.cpp | |
parent | 1edf48a0c763dee0f5d274ede6ab82d8d9b30246 (diff) | |
parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rw-r--r-- | indra/newview/llpanelprofile.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index e795e7eedb..184238c40c 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -176,6 +176,16 @@ public: return true; } + if (verb == "unblock") + { + if (params.size() > 2) + { + const std::string object_name = params[2].asString(); + LLMute mute(avatar_id, object_name, LLMute::OBJECT); + LLMuteList::getInstance()->remove(mute); + } + return true; + } return false; } }; |