diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-08 21:29:59 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-08 21:29:59 +0200 |
| commit | 472decad98ef8da6a7e3b992c193fdb0c93f9878 (patch) | |
| tree | 2d959de692c0d1e285677e6bbf1e40d66daf9d7d /indra/llprimitive/llmodel.cpp | |
| parent | 7d156389e46cfb3c0bb135e1b3eb873b24beaebe (diff) | |
| parent | e358ef21c089dfcc0df5c42627bc2c89731cfa53 (diff) | |
Merged in lindenlab/viewer-bear
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 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(); |