From 7de6475a0a61dcd79bd8b11519c01efba953293d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 3 Jan 2018 18:45:02 +0200
Subject: [PATCH] MAINT-8125 "New" tag remains visible when searching items in
Received Items panel
---
indra/llui/llbadge.cpp | 2 +-
indra/newview/llpanelmarketplaceinboxinventory.cpp | 10 ++++------
indra/newview/llpanelmarketplaceinboxinventory.h | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/indra/llui/llbadge.cpp b/indra/llui/llbadge.cpp
index 42726de0ad3..15b6899d746 100644
--- a/indra/llui/llbadge.cpp
+++ b/indra/llui/llbadge.cpp
@@ -224,7 +224,7 @@ void LLBadge::draw()
{
LLView* owner_view = mOwner.get();
- if (owner_view)
+ if (owner_view && owner_view->isInVisibleChain())
{
//
// Calculate badge size based on label text
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index e08670eff3d..2d2ba30e9b2 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -146,18 +146,16 @@ void LLInboxFolderViewFolder::draw()
LLFolderViewFolder::draw();
}
-void LLInboxFolderViewFolder::selectItem()
+BOOL LLInboxFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
{
deFreshify();
-
- LLFolderViewFolder::selectItem();
+ return LLFolderViewFolder::handleMouseDown(x, y, mask);
}
-void LLInboxFolderViewFolder::toggleOpen()
+BOOL LLInboxFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
{
deFreshify();
-
- LLFolderViewFolder::toggleOpen();
+ return LLFolderViewFolder::handleDoubleClick(x, y, mask);
}
void LLInboxFolderViewFolder::computeFreshness()
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.h b/indra/newview/llpanelmarketplaceinboxinventory.h
index b1335e2d710..d398cdafed9 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.h
+++ b/indra/newview/llpanelmarketplaceinboxinventory.h
@@ -69,8 +69,8 @@ class LLInboxFolderViewFolder : public LLFolderViewFolder, public LLBadgeOwner
void addItem(LLFolderViewItem* item);
void draw();
- void selectItem();
- void toggleOpen();
+ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
void computeFreshness();
void deFreshify();
--
GitLab