summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-10-20 15:41:38 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-10-20 15:41:38 +0300
commit628e28639d4c92cd9e70d4441ec737d9538eaeec (patch)
treeebec88bdd6d6cc5d0dbecec2b8856042257c8184 /indra/newview/llpanelmaininventory.cpp
parent9a34791488b0d2fc68fc7bc09f0685fe42557ea4 (diff)
MAINT-7906 Inventory filter fix
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 7d4a05565c..f771a027e0 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -29,7 +29,6 @@
#include "llagent.h"
#include "llagentcamera.h"
-#include "llagentwearables.h"
#include "llavataractions.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
@@ -180,8 +179,6 @@ BOOL LLPanelMainInventory::postBuild()
mWornItemsPanel->setFilterLinks(LLInventoryFilter::FILTERLINK_EXCLUDE_LINKS);
mWornItemsPanel->getFilter().markDefault();
mWornItemsPanel->setSelectCallback(boost::bind(&LLPanelMainInventory::onSelectionChange, this, mWornItemsPanel, _1, _2));
-
- gAgentWearables.addLoadedCallback(boost::bind(&LLPanelMainInventory::updateWornItemsPanel, this));
}
mSearchTypeCombo = getChild<LLComboBox>("search_type");
if(mSearchTypeCombo)
@@ -339,18 +336,6 @@ BOOL LLPanelMainInventory::handleKeyHere(KEY key, MASK mask)
}
-void LLPanelMainInventory::updateWornItemsPanel()
-{
- if (!mUpdateWornTimer.getStarted())
- {
- mUpdateWornTimer.start();
- }
- else
- {
- mUpdateWornTimer.reset();
- }
-}
-
//----------------------------------------------------------------------------
// menu callbacks
@@ -685,11 +670,6 @@ void LLPanelMainInventory::draw()
mActivePanel->setSortOrder(order);
mResortActivePanel = false;
}
- if (mWornItemsPanel && mUpdateWornTimer.getStarted() && (mUpdateWornTimer.getElapsedTimeF32() > 1))
- {
- mUpdateWornTimer.stop();
- mWornItemsPanel->getFilter().setModified(LLFolderViewFilter::FILTER_MORE_RESTRICTIVE);
- }
LLPanel::draw();
updateItemcountText();
}