diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-09-15 20:44:04 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-09-15 20:44:04 +0300 |
| commit | 329268c5f7520a288e76e253f9bffea9dc212488 (patch) | |
| tree | dffda1aca4433b5acd7cd759714b03a6e85feb67 /indra/newview/llconversationloglist.cpp | |
| parent | c50dd63ca38ce44f6c6997a052a114989db8c942 (diff) | |
| parent | c2a27c474dc11dff4f93b0bd319cfec7de27bb22 (diff) | |
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llmodelpreview.h
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index 86e23e7c83..97b16a5e93 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -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; } |