diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-07-01 16:36:25 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-07-01 16:36:25 +0300 |
| commit | 51dcb8476df521da73e935ea0d7ea5ad3b08d288 (patch) | |
| tree | 90f04eb0610ef7f5fcaeef0c601abc1a3816d83f /indra/newview | |
| parent | 3da45a3cd1e4a7984e2e41ab92ad9f97166aa3a6 (diff) | |
SH-1964 FIXED switching to "Review" wizard step upon fee request success and to "Physics" step upon failure.
Fixed disabling the final wizard step upon upload failure.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatermodelwizard.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp index 71baa0fa76..ad264399d8 100644 --- a/indra/newview/llfloatermodelwizard.cpp +++ b/indra/newview/llfloatermodelwizard.cpp @@ -500,7 +500,7 @@ void LLFloaterModelWizard::onModelPhysicsFeeReceived(F64 physics, S32 fee, std:: childSetTextArg("review_fee", "[FEE]", llformat("%d", fee)); childSetTextArg("charged_fee", "[FEE]", llformat("%d", fee)); - setState(llmin((int) UPLOAD, mState+1)); + setState(REVIEW); } /*virtual*/ @@ -512,6 +512,8 @@ void LLFloaterModelWizard::setModelPhysicsFeeErrorStatus(U32 status, const std:: modelChangedCallback(); llwarns << "LLFloaterModelWizard::setModelPhysicsFeeErrorStatus(" << status << " : " << reason << ")" << llendl; + + setState(PHYSICS); } /*virtual*/ @@ -524,7 +526,13 @@ void LLFloaterModelWizard::onModelUploadSuccess() /*virtual*/ void LLFloaterModelWizard::onModelUploadFailure() { - + // Disable the "Upload complete" step if it has been previously enabled. + if (mLastEnabledState > REVIEW) + { + mLastEnabledState = REVIEW; + } + + updateButtons(); } //static |