livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-3007 Report abuse option in paticipan list

master
Andrey Kleshchev 2022-09-08 02:18:25 +03:00
parent c3fe23ef14
commit 372e5b6dfa
5 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llconversationloglist.cpp
View File

@ -391,7 +391,8 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata)
"can_invite_to_group" == command_name ||
"can_share" == command_name ||
"can_block" == command_name ||
"can_pay" == command_name)
"can_pay" == command_name ||
"report_abuse" == command_name)
{
return is_p2p;
}

1
indra/newview/llconversationmodel.cpp
View File

@ -182,6 +182,7 @@ void LLConversationItem::buildParticipantMenuOptions(menuentry_vec_t& items, U32
items.push_back(std::string("map"));
items.push_back(std::string("share"));
items.push_back(std::string("pay"));
items.push_back(std::string("report_abuse"));
items.push_back(std::string("block_unblock"));
items.push_back(std::string("MuteText"));

19
indra/newview/llfloaterimcontainer.cpp
View File

@ -45,6 +45,7 @@
#include "llflashtimer.h"
#include "llfloateravatarpicker.h"
#include "llfloaterpreference.h"
#include "llfloaterreporter.h"
#include "llimview.h"
#include "llnotificationsutil.h"
#include "lltoolbarview.h"
@ -1242,6 +1243,18 @@ void LLFloaterIMContainer::doToParticipants(const std::string& command, uuid_vec
{
LLAvatarActions::pay(userID);
}
else if ("report_abuse" == command)
{
LLAvatarName av_name;
if (LLAvatarNameCache::get(userID, &av_name))
{
LLFloaterReporter::showFromAvatar(userID, av_name.getCompleteName());
}
else
{
LLFloaterReporter::showFromAvatar(userID, "not avaliable");
}
}
else if ("block_unblock" == command)
{
LLAvatarActions::toggleMute(userID, LLMute::flagVoiceChat);
@ -1507,7 +1520,11 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
}
// Handle all other options
if (("can_invite" == item) || ("can_chat_history" == item) || ("can_share" == item) || ("can_pay" == item))
if (("can_invite" == item)
|| ("can_chat_history" == item)
|| ("can_share" == item)
|| ("can_pay" == item)
|| ("report_abuse" == item))
{
// Those menu items are enable only if a single avatar is selected
return is_single_select;

7
indra/newview/skins/default/xui/en/menu_conversation.xml
View File

@ -132,6 +132,13 @@
<on_click function="Avatar.DoToSelected" parameter="pay" />
<on_enable function="Avatar.EnableItem" parameter="can_pay" />
</menu_item_call>
<menu_item_call
label="Report Abuse"
layout="topleft"
name="report_abuse">
<on_click function="Avatar.DoToSelected" parameter="report_abuse" />
<on_enable function="Avatar.EnableItem" parameter="report_abuse" />
</menu_item_call>
<menu_item_check
label="Block Voice"
layout="topleft"

7
indra/newview/skins/default/xui/en/menu_im_conversation.xml
View File

@ -79,6 +79,13 @@
</menu_item_call>
<menu_item_separator
layout="topleft"/>
<menu_item_call
label="Report Abuse"
layout="topleft"
name="Report Abuse">
<on_click function="Avatar.GearDoToSelected" parameter="report_abuse" />
<on_enable function="Avatar.EnableGearItem" parameter="report_abuse" />
</menu_item_call>
<menu_item_check
label="Block Voice"
layout="topleft"