diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 17:53:11 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-10 17:53:11 -0400 |
| commit | 6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (patch) | |
| tree | 48165a2aa3aed2133d1d79742e3d64cce3ca2b01 /indra/newview/llmeshrepository.cpp | |
| parent | 20c3d8485480487d38500c9b18846ca96d1d6f83 (diff) | |
| parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
merge viewer-development to mesh-development
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llmeshrepository.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1518fde66b..2b6b2a84e1 100644..100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1491,6 +1491,10 @@ void LLMeshUploadThread::generateHulls() { physics = data.mModel[LLModel::LOD_PHYSICS]; } + else if (data.mModel[LLModel::LOD_LOW].notNull()) + { + physics = data.mModel[LLModel::LOD_LOW]; + } else if (data.mModel[LLModel::LOD_MEDIUM].notNull()) { physics = data.mModel[LLModel::LOD_MEDIUM]; |