summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-23 18:19:11 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-23 18:19:11 -0700
commit370620c56bfaa69bbab807a0c7f5d78fe8c0436b (patch)
treedf08b6676b0d5aa086a20d378ff88ae007c98479
parent59f512b375b9be5198c322e2002dea9e5d767e07 (diff)
DD-19 : Revalidate the marketplace when reopening the Audit floater
-rwxr-xr-xindra/newview/llfloatermarketplacelistings.cpp18
-rwxr-xr-xindra/newview/llfloatermarketplacelistings.h1
2 files changed, 13 insertions, 6 deletions
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 );