diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-15 09:52:06 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-08-15 09:52:06 -0400 |
| commit | 57da9bcd1bba7cfc96f822540904edeb97416e7f (patch) | |
| tree | 0730cf33e552fa0c1e098c1915d7db4293069b81 /indra/newview/llpanelprofile.cpp | |
| parent | 85a13b53f5570c44c476a7af70846874dfc3ecbf (diff) | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
merge from viewer-release
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; } }; |