diff options
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 33 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llmeshrepository.h | 3 |
2 files changed, 32 insertions, 4 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 5648f33965..a06422a177 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1474,7 +1474,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures) dest = result; } -void LLMeshUploadThread::queueUpModels() +void LLMeshUploadThread::generateHulls() { for (instance_map::iterator iter = mInstance.begin(); iter != mInstance.end(); ++iter) { @@ -1529,7 +1529,7 @@ void LLMeshUploadThread::doWholeModelUpload() } else { - queueUpModels(); + generateHulls(); LLSD full_model_data; wholeModelToLLSD(full_model_data, true); @@ -1551,6 +1551,35 @@ void LLMeshUploadThread::doWholeModelUpload() mFinished = true; } +void LLMeshUploadThread::requestWholeModelFee() +{ + dump_num++; + + mCurlRequest = new LLCurlRequest(); + + generateHulls(); + + LLSD model_data; + wholeModelToLLSD(model_data,false); + dump_llsd_to_file(model_data,make_dump_name("whole_model_fee_request_",dump_num)); + + mPendingUploads++; + LLCurlRequest::headers_t headers; + mCurlRequest->post(mWholeModelFeeCapability, headers, model_data, + new LLWholeModelFeeResponder(this,model_data, mFeeObserverHandle), mMeshUploadTimeOut); + + do + { + mCurlRequest->process(); + } while (mCurlRequest->getQueued() > 0); + + delete mCurlRequest; + mCurlRequest = NULL; + + // Currently a no-op. + mFinished = true; +} + static LLFastTimer::DeclareTimer FTM_NOTIFY_MESH_LOADED("Notify Loaded"); static LLFastTimer::DeclareTimer FTM_NOTIFY_MESH_UNAVAILABLE("Notify Unavailable"); diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index 0a2127ccb4..74a08a998f 100644..100755 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -412,8 +412,7 @@ public: void discard() ; BOOL isDiscarded(); - // Queue up models for hull generation (viewer-side) - void queueUpModels(); + void generateHulls(); void doWholeModelUpload(); void requestWholeModelFee(); |