Backported 'report abuse' avatar pie menu option

3 files changed, 25 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 16879e0..9b6d8a9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:ChangeLog.txt
 2009-01-12  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * linden/indra/llcommon/llversionviewer.h
@@ -75,6 +76,13 @@
         * linden/indra/newview/llviewermenu.cpp:
         Added 'create landmark' to land pie menu.
         * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml:
+=======
+2009-01-10  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llviewermenu.cpp:
+        Backported 'report abuse' avatar pie menu option.
+        * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml:
+>>>>>>> pieavreportabuse:ChangeLog.txt
         Ditto.
 
 
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
         }
 };
 
+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)
@@ -9906,6 +9919,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" />