From 51dcb8476df521da73e935ea0d7ea5ad3b08d288 Mon Sep 17 00:00:00 2001 From: Seth ProductEngine Date: Fri, 1 Jul 2011 16:36:25 +0300 Subject: 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. --- indra/newview/llfloatermodelwizard.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'indra/newview') 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 -- cgit v1.2.3