diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llconversationloglist.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
| -rw-r--r-- | indra/newview/llconversationloglist.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp index 97b16a5e93..0909fc4045 100644 --- a/indra/newview/llconversationloglist.cpp +++ b/indra/newview/llconversationloglist.cpp @@ -86,17 +86,17 @@ 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(); - { - context_menu->buildDrawLabels(); - if (context_menu && size()) - context_menu->updateParent(LLMenuGL::sMenuContainer); - LLMenuGL::showPopup(this, context_menu, x, y); - } + if (context_menu && size()) + { + context_menu->buildDrawLabels(); + context_menu->updateParent(LLMenuGL::sMenuContainer); + LLMenuGL::showPopup(this, context_menu, x, y); + } return handled; } @@ -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) { |