summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-09 12:56:28 -0500
committerDave Parks <davep@lindenlab.com>2011-05-09 12:56:28 -0500
commitfac4ca594f4efee1da05bdc74164f56690d03bfb (patch)
tree11a84c333e157025c038bd4b44df5bc973dedadc /indra
parentc5fd41b2328bf4d029a6ba0c837f365d10b49181 (diff)
SH-1517 Always build bounding hull from highest LoD.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmeshrepository.cpp22
1 files changed, 1 insertions, 21 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index dd2ffdf7f1..ff91ce74f1 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1372,27 +1372,7 @@ void LLMeshUploadThread::run()
}
//queue up models for hull generation
- LLModel* physics = NULL;
-
- if (data.mModel[LLModel::LOD_PHYSICS].notNull())
- {
- physics = data.mModel[LLModel::LOD_PHYSICS];
- }
- else if (data.mModel[LLModel::LOD_MEDIUM].notNull())
- {
- physics = data.mModel[LLModel::LOD_MEDIUM];
- }
- else
- {
- physics = data.mModel[LLModel::LOD_HIGH];
- }
-
- if (!physics)
- {
- llerrs << "WTF?" << llendl;
- }
-
- DecompRequest* request = new DecompRequest(physics, data.mBaseModel, this);
+ DecompRequest* request = new DecompRequest(data.mModel[LLModel::LOD_HIGH], data.mBaseModel, this);
gMeshRepo.mDecompThread->submitRequest(request);
}