From 9945fc1767382c2659942c4546e3aeb0cd427ea9 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 12 Jul 2019 17:48:59 -0400
Subject: [PATCH] Enable Abuse Report from P2P IM

---
 indra/newview/llimpanel.cpp                                     | 2 ++
 .../newview/skins/default/xui/en-us/floater_instant_message.xml | 1 +
 .../xui/en-us/floater_instant_message_concisebuttons.xml        | 1 +
 3 files changed, 4 insertions(+)

diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 6334a7f62..b88fa6e40 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -45,6 +45,7 @@
 #include "llfloateravatarpicker.h"
 #include "llfloaterchat.h"
 #include "llfloaterinventory.h"
+#include "llfloaterreporter.h"
 #include "llfloaterwebcontent.h" // For web browser display of logs
 #include "llgroupactions.h"
 #include "llhttpclient.h"
@@ -1138,6 +1139,7 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
 	case -2: LLAvatarActions::showOnMap(mOtherParticipantUUID); break;
 	case -3: gAgentCamera.lookAtObject(mOtherParticipantUUID); break;
 	case -4: onAddButtonClicked(); break;
+	case -5: LLFloaterReporter::showFromAvatar(mOtherParticipantUUID, mLogLabel); break;
 	default: // Options >= 6 use dynamic items
 	{
 		// First remove them all
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 331ee9b8a..356a41861 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -16,6 +16,7 @@
       <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
       <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="-1"/>
       <flyout_button_item label="Add to Conference" name="conference" value="-4"/>
+      <flyout_button_item label="Report Abuse" name="report" value="-5"/>
     </flyout_button>
     <string name="find on map" value="Find on Map"/>
     <string name="ding on" value="Ding on new messages (On)"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
index 6bfe25215..a2590a7ed 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
@@ -20,6 +20,7 @@
       <flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/>
       <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="-1"/>
       <flyout_button_item label="Add to Conference" name="conference" value="-4"/>
+      <flyout_button_item label="Report Abuse" name="report" value="-5"/>
     </flyout_button>
     <string name="find on map" value="Find on Map"/>
     <string name="ding on" value="Ding on new messages (On)"/>