1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
index 838062795b..65863f0a5e 100644
--- a/indra/newview/llconversationloglist.cpp
+++ b/indra/newview/llconversationloglist.cpp
@@ -86,16 +86,15 @@ 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);
-
+        context_menu->updateParent(LLMenuGL::sMenuContainer);
         LLMenuGL::showPopup(this, context_menu, x, y);
     }
 
@@ -370,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)
     {