summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofile.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-26 15:14:12 -0400
committerOz Linden <oz@lindenlab.com>2013-08-26 15:14:12 -0400
commit7ca10e516126e5fa9b076c04957b491495513907 (patch)
tree690323c7379c8151b1d7e251fa2878c10603fd61 /indra/newview/llpanelprofile.cpp
parent1e2a6ee3f440b7d076dc97f3a0628c90195f5386 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
merge changes for 3.6.4-release
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
-rwxr-xr-xindra/newview/llpanelprofile.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index e2e7006773..5acc98904b 100755
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -36,6 +36,8 @@
#include "lltabcontainer.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
+#include "llmutelist.h"
+#include "llpanelblockedlist.h"
static const std::string PANEL_PICKS = "panel_picks";
@@ -137,6 +139,12 @@ public:
return true;
}
+ if (verb == "removefriend")
+ {
+ LLAvatarActions::removeFriendDialog(avatar_id);
+ return true;
+ }
+
if (verb == "mute")
{
if (! LLAvatarActions::isBlocked(avatar_id))
@@ -155,6 +163,18 @@ public:
return true;
}
+ if (verb == "block")
+ {
+ if (params.size() > 2)
+ {
+ const std::string object_name = params[2].asString();
+ LLMute mute(avatar_id, object_name, LLMute::OBJECT);
+ LLMuteList::getInstance()->add(mute);
+ LLPanelBlockedList::showPanelAndSelect(mute.mID);
+ }
+ return true;
+ }
+
return false;
}
};