summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-11-08 12:33:57 -0800
committerMerov Linden <merov@lindenlab.com>2014-11-08 12:33:57 -0800
commitb5e557b1370202a0ffe7f0345ea114181540f96c (patch)
tree538e0003a3fa81b39187962053b003f0de259039 /indra
parent23a5b43cb923654f7779f4424c1bb2a374bbd2a5 (diff)
DD-258 : Disable the Check for Errors buttons (aka Audit) while the inventory is still fetching
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfloatermarketplacelistings.cpp10
-rwxr-xr-xindra/newview/llfloatermarketplacelistings.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index bbbc27fe16..c732c8b2ce 100755
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -67,6 +67,9 @@ BOOL LLPanelMarketplaceListings::postBuild()
mFilterEditor = getChild<LLFilterEditor>("filter_editor");
mFilterEditor->setCommitCallback(boost::bind(&LLPanelMarketplaceListings::onFilterEdit, this, _2));
+ mAuditBtn = getChild<LLButton>("audit_btn");
+ mAuditBtn->setEnabled(FALSE);
+
return LLPanel::postBuild();
}
@@ -134,6 +137,13 @@ void LLPanelMarketplaceListings::draw()
{
update_all_marketplace_count();
}
+
+ // Get the audit button enabled only after the whole inventory is fetched
+ if (!mAuditBtn->getEnabled())
+ {
+ mAuditBtn->setEnabled(LLInventoryModelBackgroundFetch::instance().isEverythingFetched());
+ }
+
LLPanel::draw();
}
diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h
index 4068351b52..0ba6ecae4a 100755
--- a/indra/newview/llfloatermarketplacelistings.h
+++ b/indra/newview/llfloatermarketplacelistings.h
@@ -70,6 +70,7 @@ private:
void onFilterEdit(const std::string& search_string);
LLInventoryPanel* mAllPanel;
+ LLButton* mAuditBtn;
LLFilterEditor* mFilterEditor;
std::string mFilterSubString;
LLInventoryFilter::ESortOrderType mSortOrder;