Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable Abuse Report from P2P IM

Browse Source
This commit is contained in:
Lirusaito
2019-07-12 17:48:59 -04:00
parent 186cf58197
commit 9945fc1767
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llimpanel.cpp
View File

@@ -45,6 +45,7 @@
#include "llfloateravatarpicker.h" #include "llfloateravatarpicker.h"
#include "llfloaterchat.h" #include "llfloaterchat.h"
#include "llfloaterinventory.h" #include "llfloaterinventory.h"
#include "llfloaterreporter.h"
#include "llfloaterwebcontent.h" // For web browser display of logs #include "llfloaterwebcontent.h" // For web browser display of logs
#include "llgroupactions.h" #include "llgroupactions.h"
#include "llhttpclient.h" #include "llhttpclient.h"
@@ -1138,6 +1139,7 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value)
case -2: LLAvatarActions::showOnMap(mOtherParticipantUUID); break; case -2: LLAvatarActions::showOnMap(mOtherParticipantUUID); break;
case -3: gAgentCamera.lookAtObject(mOtherParticipantUUID); break; case -3: gAgentCamera.lookAtObject(mOtherParticipantUUID); break;
case -4: onAddButtonClicked(); break; case -4: onAddButtonClicked(); break;
case -5: LLFloaterReporter::showFromAvatar(mOtherParticipantUUID, mLogLabel); break;
default: // Options >= 6 use dynamic items default: // Options >= 6 use dynamic items
{ {
// First remove them all // First remove them all

1
indra/newview/skins/default/xui/en-us/floater_instant_message.xml
View File

@@ -16,6 +16,7 @@
<flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/> <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="Copy SLURL" name="copy_slurl_item" value="-1"/>
<flyout_button_item label="Add to Conference" name="conference" value="-4"/> <flyout_button_item label="Add to Conference" name="conference" value="-4"/>
<flyout_button_item label="Report Abuse" name="report" value="-5"/>
</flyout_button> </flyout_button>
<string name="find on map" value="Find on Map"/> <string name="find on map" value="Find on Map"/>
<string name="ding on" value="Ding on new messages (On)"/> <string name="ding on" value="Ding on new messages (On)"/>

1
indra/newview/skins/default/xui/en-us/floater_instant_message_concisebuttons.xml
View File

@@ -20,6 +20,7 @@
<flyout_button_item label="Invite To Group" name="group_invite_item" value="5"/> <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="Copy SLURL" name="copy_slurl_item" value="-1"/>
<flyout_button_item label="Add to Conference" name="conference" value="-4"/> <flyout_button_item label="Add to Conference" name="conference" value="-4"/>
<flyout_button_item label="Report Abuse" name="report" value="-5"/>
</flyout_button> </flyout_button>
<string name="find on map" value="Find on Map"/> <string name="find on map" value="Find on Map"/>
<string name="ding on" value="Ding on new messages (On)"/> <string name="ding on" value="Ding on new messages (On)"/>