summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationloglist.cpp
diff options
context:
space:
mode:
authorAnsariel Hiller <Ansariel@users.noreply.github.com>2024-09-04 20:58:27 +0200
committerGitHub <noreply@github.com>2024-09-04 21:58:27 +0300
commit12283fd8f700bd713a2d9eb5e1918fbcf41450cd (patch)
treebc57816faa4e11073f2ba4530d15c253db9f561a /indra/newview/llconversationloglist.cpp
parent206bdc90de1cbb68f78df74c1b6cf6426522ef79 (diff)
Merge fixes (#2499)
Diffstat (limited to 'indra/newview/llconversationloglist.cpp')
-rw-r--r--indra/newview/llconversationloglist.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llconversationloglist.cpp b/indra/newview/llconversationloglist.cpp
index 3e08c6ee60..58c05af4db 100644
--- a/indra/newview/llconversationloglist.cpp
+++ b/indra/newview/llconversationloglist.cpp
@@ -94,8 +94,7 @@ bool LLConversationLogList::handleRightMouseDown(S32 x, S32 y, MASK mask)
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);
}