aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-12 10:54:25 -0700
committerMcCabe Maxsted2009-01-12 10:54:25 -0700
commit263319bae6cc197fee412b8b1a64d0b6a06b0c21 (patch)
treed43a89bfbefe57ba24cb5bf5e92586a6ee826e64 /linden/indra/newview/llviewermenu.cpp
parentAdded 'create landmark' to land pie menu (diff)
parentBackported 'report abuse' avatar pie menu option. (diff)
downloadmeta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.zip
meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.tar.gz
meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.tar.bz2
meta-impy-263319bae6cc197fee412b8b1a64d0b6a06b0c21.tar.xz
Backported 'report abuse' avatar pie menu option
Diffstat (limited to 'linden/indra/newview/llviewermenu.cpp')
-rw-r--r--linden/indra/newview/llviewermenu.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index cd557f2..1f3b14d 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -9760,6 +9760,19 @@ class LLAdvancedLeaveAdminStatus : public view_listener_t
9760 } 9760 }
9761}; 9761};
9762 9762
9763class LLAvatarReportAbuse : public view_listener_t
9764{
9765 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
9766 {
9767 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
9768 if(avatar)
9769 {
9770 LLFloaterReporter::showFromObject(avatar->getID());
9771 }
9772 return true;
9773 }
9774};
9775
9763 9776
9764 9777
9765static void addMenu(view_listener_t *menu, const char *name) 9778static void addMenu(view_listener_t *menu, const char *name)
@@ -9906,6 +9919,7 @@ void initialize_menus()
9906 addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard"); 9919 addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
9907 addMenu(new LLAvatarEject(), "Avatar.Eject"); 9920 addMenu(new LLAvatarEject(), "Avatar.Eject");
9908 addMenu(new LLAvatarSendIM(), "Avatar.SendIM"); 9921 addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
9922 addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
9909 9923
9910 addMenu(new LLObjectEnableMute(), "Avatar.EnableMute"); 9924 addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
9911 addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend"); 9925 addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");