diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-09-15 17:00:34 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-09-15 17:00:34 -0700 |
| commit | f08f20db5f9936956c2210b73011f7e2ff45af03 (patch) | |
| tree | d8b8a5d77d65c0342c0d06a480e4382dc5ffd6ba /indra/newview/llconversationloglist.cpp | |
| parent | 5883ff178bb608b10eafe9bfa0aeb961d8afcecd (diff) | |
| parent | f83289d3a7e80bebe47f696f96aee1b7e64d1d69 (diff) | |
Merge branch 'master' into DRTVWR-568
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; } |