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

Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation

meow-7.2.2
Xiaohong Bao 2011-06-09 17:08:17 -06:00
parent f14fc028af 7322601455
commit fa4d4469dd
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfloatermodelpreview.cpp
View File

@ -915,8 +915,11 @@ void LLFloaterModelPreview::onPhysicsStageExecute(LLUICtrl* ctrl, void* data)
{
LLModel* mdl = sInstance->mModelPreview->mModel[LLModel::LOD_PHYSICS][i];
DecompRequest* request = new DecompRequest(stage, mdl);
sInstance->mCurRequest.insert(request);
gMeshRepo.mDecompThread->submitRequest(request);
if(request->isValid())
{
sInstance->mCurRequest.insert(request);
gMeshRepo.mDecompThread->submitRequest(request);
}
}
}

7
indra/newview/llfloatermodelwizard.cpp
View File

@ -422,8 +422,11 @@ void LLFloaterModelWizard::executePhysicsStage(std::string stage_name)
{
LLModel* mdl = sInstance->mModelPreview->mModel[LLModel::LOD_PHYSICS][i];
DecompRequest* request = new DecompRequest(stage_name, mdl);
sInstance->mCurRequest.insert(request);
gMeshRepo.mDecompThread->submitRequest(request);
if(request->isValid())
{
sInstance->mCurRequest.insert(request);
gMeshRepo.mDecompThread->submitRequest(request);
}
}
}
}

5
indra/newview/llmeshrepository.cpp
View File

@ -1640,7 +1640,10 @@ void LLMeshUploadThread::doWholeModelUpload()
llassert(physics != NULL);
DecompRequest* request = new DecompRequest(physics, data.mBaseModel, this);
gMeshRepo.mDecompThread->submitRequest(request);
if(request->isValid())
{
gMeshRepo.mDecompThread->submitRequest(request);
}
}
while (!mPhysicsComplete)

2
indra/newview/llmeshrepository.h
View File

@ -161,6 +161,8 @@ public:
virtual void setStatusMessage(const std::string& msg);
bool isValid() const {return mPositions.size() > 2 && mIndices.size() > 2 ;}
protected:
//internal use
LLVector3 mBBox[2] ;