diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-01-03 16:30:57 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-01-03 16:30:57 +0200 |
| commit | c56298d4ba818aaa5b69a8c30e5b577f7e4596eb (patch) | |
| tree | 008f3e50c3a2210413d6244db6bb97e9a67fafc7 /indra/llprimitive | |
| parent | a35008993eef5b1fee5695804c83050cf922d146 (diff) | |
MAINT-8022 Make unzip silent yet include failure reason into output
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 db6d00bc2c..29af859cd0 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -1354,7 +1354,7 @@ bool LLModel::loadSkinInfo(LLSD& header, std::istream &is) LLSD skin_data; - if (unzip_llsd(skin_data, is, size)) + if (LLUZipHelper::unzip_llsd(skin_data, is, size) == LLUZipHelper::ZR_OK) { mSkinInfo.fromLLSD(skin_data); return true; @@ -1375,7 +1375,7 @@ bool LLModel::loadDecomposition(LLSD& header, std::istream& is) LLSD data; - if (unzip_llsd(data, is, size)) + if (LLUZipHelper::unzip_llsd(data, is, size) == LLUZipHelper::ZR_OK) { mPhysics.fromLLSD(data); updateHullCenters(); |