diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-28 12:41:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-28 12:41:12 -0500 |
| commit | 12e08417bfdf5d50feea544a54bbb333ad01acce (patch) | |
| tree | d15022dbe74d3f6f2dda7b84ab7ba92538b416c4 /indra/llprimitive | |
| parent | 4df70b55233ecf6bd6ed89a42281ce62d90c672f (diff) | |
SH-1169 Fix for convex decompositions not working post mesh-asset-deprecation work. (also default SLM usage to on)
Diffstat (limited to 'indra/llprimitive')
| -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(); |