diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:18:31 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:18:31 -0400 |
| commit | 7ccf02515ad3f9e3bf795d651fe4b3c0d773f353 (patch) | |
| tree | c4adc897c07f652e617e91fbf41c12b823acc808 /indra/newview/llplacesfolderview.cpp | |
| parent | 1abf5f18d6afc7ae9e1b1562b92e5c1ce33b722f (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge commit 'e7eced3' into lua-timers for whitespace fixes.
Diffstat (limited to 'indra/newview/llplacesfolderview.cpp')
| -rw-r--r-- | indra/newview/llplacesfolderview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llplacesfolderview.cpp b/indra/newview/llplacesfolderview.cpp index fe89c1e314..3661d98c2a 100644 --- a/indra/newview/llplacesfolderview.cpp +++ b/indra/newview/llplacesfolderview.cpp @@ -1,4 +1,4 @@ -/** +/** * @file llplacesfolderview.cpp * @brief llplacesfolderview used within llplacesinventorypanel * @author Gilbert@lindenlab.com @@ -70,12 +70,12 @@ BOOL LLPlacesFolderView::handleRightMouseDown(S32 x, S32 y, MASK mask) void LLPlacesFolderView::updateMenu() { - LLFolderView::updateMenu(); - LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get(); - if (menu && menu->getVisible()) - { - mParentLandmarksPanel->updateMenuVisibility(menu); - } + LLFolderView::updateMenu(); + LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get(); + if (menu && menu->getVisible()) + { + mParentLandmarksPanel->updateMenuVisibility(menu); + } } void LLPlacesFolderView::setupMenuHandle(LLInventoryType::EType asset_type, LLHandle<LLView> menu_handle) |