summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-14 14:01:16 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-14 14:01:16 -0500
commit9778c3d7b39402683dfbb7ae4720fd6950d7796a (patch)
treea276afa36fd506d063697fbf2e9530468a2a0033
parentb1d45020185b985a3d07e80b7c5e26469796d794 (diff)
EXT-3407 : "Recent Items" panel shows as empty
The text in the search editor is now properly kept updated.
-rw-r--r--indra/newview/llpanelmaininventory.cpp14
-rw-r--r--indra/newview/llpanelmaininventory.h3
2 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index cef21e85d6..c0da8f3daa 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -530,11 +530,23 @@ BOOL LLPanelMainInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
return handled;
}
-void LLPanelMainInventory::changed(U32 mask)
+// virtual
+void LLPanelMainInventory::changed(U32)
{
+ // empty, but must have this defined for abstract base class.
}
+// virtual
+void LLPanelMainInventory::draw()
+{
+ if (mActivePanel && mFilterEditor)
+ {
+ mFilterEditor->setText(mActivePanel->getFilterSubString());
+ }
+ LLPanel::draw();
+}
+
void LLPanelMainInventory::setFilterTextFromFilter()
{
mFilterText = mActivePanel->getFilter()->getFilterText();
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 92443df369..920de2665c 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -72,7 +72,8 @@ public:
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
- /*virtual*/ void changed(U32 mask);
+ /*virtual*/ void changed(U32);
+ /*virtual*/ void draw();
LLInventoryPanel* getPanel() { return mActivePanel; }
LLInventoryPanel* getActivePanel() { return mActivePanel; }