diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:14 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:14 -0700 |
| commit | 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c (patch) | |
| tree | ad252385e65cd862ba42d57b282453af8cb12f73 /indra/newview/llfloatermodelwizard.cpp | |
| parent | e63dd834ab84d740b242686d6e5315f7b47d03da (diff) | |
Fix for SH-2028. Also fixed layout issues with new upload warning and upload price text when floater is resized.
Diffstat (limited to 'indra/newview/llfloatermodelwizard.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelwizard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp index 7efcdb6145..b517b78e5a 100644 --- a/indra/newview/llfloatermodelwizard.cpp +++ b/indra/newview/llfloatermodelwizard.cpp @@ -488,7 +488,7 @@ void LLFloaterModelWizard::setPermissonsErrorStatus(U32 status, const std::strin } /*virtual*/ -void LLFloaterModelWizard::onModelPhysicsFeeReceived(F64 physics, S32 fee, std::string upload_url) +void LLFloaterModelWizard::onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url) { swap_controls(mCalculateWeightsBtn, mCalculatingWeightsBtn, true); @@ -498,6 +498,7 @@ void LLFloaterModelWizard::onModelPhysicsFeeReceived(F64 physics, S32 fee, std:: mUploadModelUrl = upload_url; + S32 fee = result["upload_price"].asInteger(); childSetTextArg("review_fee", "[FEE]", llformat("%d", fee)); childSetTextArg("charged_fee", "[FEE]", llformat("%d", fee)); |