diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index fcf2b74dd6..121f54095b 100755 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -581,8 +581,8 @@ void LLFloaterAssociateListing::cancel() // LLFloaterMarketplaceValidation //----------------------------------------------------------------------------- -LLFloaterMarketplaceValidation::LLFloaterMarketplaceValidation(const LLSD& data) -: LLModalDialog( data["message"].asString() ), +LLFloaterMarketplaceValidation::LLFloaterMarketplaceValidation(const LLSD& key) +: LLFloater(key), mEditor(NULL) { } @@ -614,7 +614,7 @@ LLFloaterMarketplaceValidation::~LLFloaterMarketplaceValidation() void LLFloaterMarketplaceValidation::draw() { // draw children - LLModalDialog::draw(); + LLFloater::draw(); } // static diff --git a/indra/newview/llfloatermarketplacelistings.h b/indra/newview/llfloatermarketplacelistings.h index 43665e643e..91ae33d1f2 100755 --- a/indra/newview/llfloatermarketplacelistings.h +++ b/indra/newview/llfloatermarketplacelistings.h @@ -154,14 +154,13 @@ private: // get the validation triggered on the server and display the html report. // *TODO : morph into an html/text window using the pattern in llfloatertos -class LLFloaterMarketplaceValidation : public LLModalDialog +class LLFloaterMarketplaceValidation : public LLFloater { public: - LLFloaterMarketplaceValidation(const LLSD& data); + LLFloaterMarketplaceValidation(const LLSD& key); virtual ~LLFloaterMarketplaceValidation(); - BOOL postBuild(); - + virtual BOOL postBuild(); virtual void draw(); void appendMessage(std::string& message); diff --git a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml index 01d467a307..165540cfa1 100755 --- a/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml +++ b/indra/newview/skins/default/xui/en/floater_marketplace_validation.xml @@ -1,49 +1,58 @@ + title="MARKETPLACE VALIDATION LOG" + name="floater_marketplace_validation" + help_topic="floater_marketplace_validation" + layout="topleft" + positioning="cascading" + legacy_header_height="18" + width="600" + height="500" + min_width="400" + min_height="200" + can_close="true" + can_resize="true" + can_minimize="true" + save_rect="true" + reuse_instance="true" + save_visibility="false">