From 370620c56bfaa69bbab807a0c7f5d78fe8c0436b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 23 Apr 2014 18:19:11 -0700 Subject: DD-19 : Revalidate the marketplace when reopening the Audit floater --- indra/newview/llfloatermarketplacelistings.cpp | 18 ++++++++++++------ indra/newview/llfloatermarketplacelistings.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index 121f54095b..76cca065c8 100755 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -597,12 +597,6 @@ BOOL LLFloaterMarketplaceValidation::postBuild() mEditor->setFocus(TRUE); mEditor->setValue(LLSD()); - // Validates the marketplace - LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true); - llassert(marketplacelistings_id.notNull()); - LLViewerInventoryCategory* cat = gInventory.getCategory(marketplacelistings_id); - validate_marketplacelistings(cat,boost::bind(&LLFloaterMarketplaceValidation::appendMessage, this, _1)); - return TRUE; } @@ -617,6 +611,18 @@ void LLFloaterMarketplaceValidation::draw() LLFloater::draw(); } +void LLFloaterMarketplaceValidation::onOpen(const LLSD& key) +{ + // Clear the text panel + mEditor->setValue(LLSD()); + + // Validates the marketplace + LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true); + llassert(marketplacelistings_id.notNull()); + LLViewerInventoryCategory* cat = gInventory.getCategory(marketplacelistings_id); + validate_marketplacelistings(cat,boost::bind(&LLFloaterMarketplaceValidation::appendMessage, this, _1)); +} + // static void LLFloaterMarketplaceValidation::onOK( void* userdata ) { diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h index 91ae33d1f2..cb900c903c 100755 --- a/indra/newview/llfloatermarketplacelistings.h +++ b/indra/newview/llfloatermarketplacelistings.h @@ -162,6 +162,7 @@ public: virtual BOOL postBuild(); virtual void draw(); + virtual void onOpen(const LLSD& key); void appendMessage(std::string& message); static void onOK( void* userdata ); -- cgit v1.2.3