From 6f6938f5bb6a3ab20818276656ccea0f2dcb91a2 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Mon, 21 Jul 2014 18:04:20 -0400 Subject: [PATCH] Function removal in LFFloaterInvPanel, in favor of boost::bind function. --- indra/newview/lffloaterinvpanel.cpp | 7 +------ indra/newview/lffloaterinvpanel.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/indra/newview/lffloaterinvpanel.cpp b/indra/newview/lffloaterinvpanel.cpp index 522762080..31d144673 100644 --- a/indra/newview/lffloaterinvpanel.cpp +++ b/indra/newview/lffloaterinvpanel.cpp @@ -29,7 +29,7 @@ LFFloaterInvPanel::LFFloaterInvPanel(const LLUUID& cat_id, LLInventoryModel* model, const std::string& name) : LLInstanceTracker(cat_id) { - mCommitCallbackRegistrar.add("InvPanel.Search", boost::bind(&LFFloaterInvPanel::onSearch, this, _2)); + mCommitCallbackRegistrar.add("InvPanel.Search", boost::bind(&LLInventoryPanel::setFilterSubString, boost::ref(mPanel), _2)); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inv_panel.xml"); LLPanel* panel = getChild("placeholder_panel"); mPanel = new LLInventoryPanel("inv_panel", LLInventoryPanel::DEFAULT_SORT_ORDER, cat_id.asString(), panel->getRect(), model, true); @@ -83,8 +83,3 @@ BOOL LFFloaterInvPanel::handleKeyHere(KEY key, MASK mask) return LLFloater::handleKeyHere(key, mask); } - -void LFFloaterInvPanel::onSearch(const LLSD& val) -{ - mPanel->setFilterSubString(val.asString()); -} diff --git a/indra/newview/lffloaterinvpanel.h b/indra/newview/lffloaterinvpanel.h index 24ae089fd..3c9104db1 100644 --- a/indra/newview/lffloaterinvpanel.h +++ b/indra/newview/lffloaterinvpanel.h @@ -35,7 +35,6 @@ public: static void closeAll(); // Called when not allowed to have inventory open /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); - void onSearch(const LLSD& val); private: class LLInventoryPanel* mPanel;