summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-06-09 17:08:17 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-06-09 17:08:17 -0600
commitfa4d4469dd229030b46c11c6060fdbcfaec12e41 (patch)
tree620f99cda028e4ddee4f9243d69b4fbab1dc6814 /indra/newview/llfloatermodelpreview.cpp
parentf14fc028af5f75601eaaedf5ed3923a9d039bad7 (diff)
parent73226014555b028ae2bdec29b8c7d60e6c20c2df (diff)
Automated merge with https://bitbucket.org/davep/mesh-asset-deprecation
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rw-r--r--indra/newview/llfloatermodelpreview.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 5f961e2dbc..409d8bc79a 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -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);
+ }
}
}