livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge cleanup

meow-7.2.2
Brad Payne (Vir Linden) 2011-07-05 14:11:16 -04:00
parent d8d1587d49
commit b466e95b4d
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llmeshrepository.cpp
View File

@ -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");

3
indra/newview/llmeshrepository.h Normal file → Executable file
View File

@ -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();