diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-30 18:19:37 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-30 18:19:37 -0500 |
| commit | a1fb8ae0d0679499a68fb8dd1965ab5026878c73 (patch) | |
| tree | 25de72ff262137db61636dd581ec0d6bcf172968 /indra/llprimitive/llmodel.cpp | |
| parent | a5d7485cdca5594fce26e1cb011e7feb8895c69e (diff) | |
| parent | 38778fcc6186abe2c6f037f07191780f87dd8cd7 (diff) | |
merge
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 972f256076..da78b30b34 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1798,7 +1798,7 @@ bool LLModel::loadModel(std::istream& is) is.seekg(cur_pos); } - if (lod == LLModel::LOD_PHYSICS) + if (lod == LLModel::LOD_HIGH || lod == LLModel::LOD_PHYSICS) { std::ios::pos_type cur_pos = is.tellg(); loadDecomposition(header, is); @@ -2015,7 +2015,7 @@ LLModel::Decomposition::Decomposition(LLSD& data) void LLModel::Decomposition::fromLLSD(LLSD& decomp) { - if (decomp.has("HullList")) + if (decomp.has("HullList") && decomp.has("Positions")) { // updated for const-correctness. gcc is picky about this type of thing - Nyx const LLSD::Binary& hulls = decomp["HullList"].asBinary(); |