diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-06-30 15:57:14 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-06-30 15:57:14 -0400 |
| commit | 1716b8428f88989b2b8898e27cc137e7746a4805 (patch) | |
| tree | 2a488249a8618ec6aa406e140637701d6fa98f87 /indra/newview/llfloatermodelwizard.cpp | |
| parent | 06b1202747c07409c877cb89432f0df0bfacba47 (diff) | |
| parent | 17060f4e92b12ab74a1b570cd9ee4d1543fb23d1 (diff) | |
Automated merge with https://bitbucket.org/seth_productengine/mesh-development
Diffstat (limited to 'indra/newview/llfloatermodelwizard.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelwizard.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/indra/newview/llfloatermodelwizard.cpp b/indra/newview/llfloatermodelwizard.cpp index 254c54ad2a..71baa0fa76 100644 --- a/indra/newview/llfloatermodelwizard.cpp +++ b/indra/newview/llfloatermodelwizard.cpp @@ -274,7 +274,7 @@ void LLFloaterModelWizard::onClickCalculateUploadFee() LLMeshUploadThread* thread = new LLMeshUploadThread(mModelPreview->mUploadData, mModelPreview->mPreviewScale, true, false, false, mUploadModelUrl, false); - thread->setObserverHandle(getWholeModelFeeObserverHandle()); + thread->setFeeObserverHandle(getWholeModelFeeObserverHandle()); gMeshRepo.mUploadWaitList.push_back(thread); } @@ -514,6 +514,19 @@ void LLFloaterModelWizard::setModelPhysicsFeeErrorStatus(U32 status, const std:: llwarns << "LLFloaterModelWizard::setModelPhysicsFeeErrorStatus(" << status << " : " << reason << ")" << llendl; } +/*virtual*/ +void LLFloaterModelWizard::onModelUploadSuccess() +{ + // success! + setState(UPLOAD); +} + +/*virtual*/ +void LLFloaterModelWizard::onModelUploadFailure() +{ + +} + //static void LLFloaterModelWizard::executePhysicsStage(std::string stage_name) { @@ -695,11 +708,12 @@ void LLFloaterModelWizard::onUpload() { mModelPreview->rebuildUploadData(); - gMeshRepo.uploadModel(mModelPreview->mUploadData, mModelPreview->mPreviewScale, + LLMeshUploadThread* thread = new LLMeshUploadThread(mModelPreview->mUploadData, mModelPreview->mPreviewScale, true, false, false, mUploadModelUrl, true); - - setState(UPLOAD); - + + thread->setUploadObserverHandle(getWholeModelUploadObserverHandle()); + + gMeshRepo.mUploadWaitList.push_back(thread); } void LLFloaterModelWizard::onPreviewLODCommit(LLUICtrl* ctrl) |