diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
| commit | 22a47eee84dbaa5c731c000c6013ca558bd15892 (patch) | |
| tree | 8b3128fdb91731d95025b86701431826c441c5ba /indra/newview/llconversationloglist.cpp | |
| parent | a6b85244a6f943a4598ff9b7b8a3343eb1e0d11e (diff) | |
| parent | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (diff) | |
Merge branch 'release/luau-scripting' into lua-resultset
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index f6fce7146d..de15fba201 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -86,14 +86,14 @@ void LLConversationLogList::draw() LLFlatListViewEx::draw(); } -BOOL LLConversationLogList::handleRightMouseDown(S32 x, S32 y, MASK mask) +bool LLConversationLogList::handleRightMouseDown(S32 x, S32 y, MASK mask) { - BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); + bool handled = LLUICtrl::handleRightMouseDown(x, y, mask); LLToggleableMenu* context_menu = mContextMenu.get(); + if (context_menu && size()) { context_menu->buildDrawLabels(); - if (context_menu && size()) context_menu->updateParent(LLMenuGL::sMenuContainer); LLMenuGL::showPopup(this, context_menu, x, y); } @@ -369,7 +369,7 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata) bool is_p2p = LLIMModel::LLIMSession::P2P_SESSION == stype; bool is_group = LLIMModel::LLIMSession::GROUP_SESSION == stype; - bool is_group_member = is_group && gAgent.isInGroup(selected_id, TRUE); + bool is_group_member = is_group && gAgent.isInGroup(selected_id, true); if ("can_im" == command_name) { |