From 7d8697c509a7976c077368dba79c8d8088eabf4c Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 10 Jan 2009 11:47:39 -0700
Subject: Backported 'report abuse' avatar pie menu option.

---
 linden/indra/newview/llviewermenu.cpp                      | 14 ++++++++++++++
 .../newview/skins/default/xui/en-us/menu_pie_avatar.xml    |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 3bf390e..870c3fc 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -9751,6 +9751,19 @@ class LLAdvancedLeaveAdminStatus : public view_listener_t
 	}
 };
 
+class LLAvatarReportAbuse : public view_listener_t
+{
+		bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+		{
+			LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
+			if(avatar)
+			{
+				LLFloaterReporter::showFromObject(avatar->getID());
+			}
+			return true;
+		}
+};
+
 
 
 static void addMenu(view_listener_t *menu, const char *name)
@@ -9897,6 +9910,7 @@ void initialize_menus()
 	addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
 	addMenu(new LLAvatarEject(), "Avatar.Eject");
 	addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
+	addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
 	
 	addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
 	addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index c8d8ed6..625b761 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -10,7 +10,9 @@
 	<menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To">
 		<on_click function="GoToObject" />
 	</menu_item_call>
-	<menu_item_separator />
+  <menu_item_call enabled="false" label="Report Abuse..." mouse_opaque="true" name="abuse">
+    <on_click function="Avatar.ReportAbuse" />
+  </menu_item_call>
 	<menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
 		<on_click function="Avatar.AddFriend" />
 		<on_enable function="Avatar.EnableAddFriend" />
-- 
cgit v1.1