Fixed normal bug EXT-4476 - Classfield appears in classfield accordeon after error message about money scarcity has been closed.

--HG--
branch : product-engine
master
Dmitry Zaporozhan 2010-01-20 13:16:23 +02:00
parent f53f65cc1a
commit 284279966b
3 changed files with 25 additions and 1 deletions

View File

@ -72,6 +72,7 @@
#include "llviewerwindow.h" // for window width, height
#include "llappviewer.h" // abortQuit()
#include "lltrans.h"
#include "llstatusbar.h"
const S32 MINIMUM_PRICE_FOR_LISTING = 50; // L$
const S32 MATURE_UNDEFINED = -1;
@ -1364,6 +1365,7 @@ static const S32 CB_ITEM_PG = 1;
LLPanelClassifiedEdit::LLPanelClassifiedEdit()
: LLPanelClassifiedInfo()
, mIsNew(false)
, mCanClose(false)
{
}
@ -1559,7 +1561,7 @@ void LLPanelClassifiedEdit::resetControls()
bool LLPanelClassifiedEdit::canClose()
{
return isValidName();
return mCanClose;
}
void LLPanelClassifiedEdit::sendUpdate()
@ -1676,12 +1678,23 @@ void LLPanelClassifiedEdit::onChange()
void LLPanelClassifiedEdit::onSaveClick()
{
mCanClose = false;
if(!isValidName())
{
notifyInvalidName();
return;
}
if(isNew())
{
if(gStatusBar->getBalance() < getPriceForListing())
{
LLNotificationsUtil::add("ClassifiedInsuffisientFunds");
return;
}
}
mCanClose = true;
sendUpdate();
resetDirty();
}

View File

@ -340,6 +340,7 @@ protected:
private:
bool mIsNew;
bool mCanClose;
};
#endif // LL_LLPANELCLASSIFIED_H

View File

@ -770,6 +770,16 @@ Save changes to classified [NAME]?
notext="Don&apos;t Save"
yestext="Save"/>
</notification>
<notification
icon="alertmodal.tga"
name="ClassifiedInsuffisientFunds"
type="alertmodal">
Insuffisient funds to create classified.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"