diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-29 19:01:41 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-29 19:01:41 -0500 |
| commit | 6f2acc8e60da1699265c38acc5bd0d2871d0c9f7 (patch) | |
| tree | fc4d8fbabc1ef3d39fa8b46f7cc3026e7e7339ff /indra/newview/llgltfmateriallist.cpp | |
| parent | 10b2d1be01978261ee0c452fdfabe2ec68ad1642 (diff) | |
| parent | f2867c71dba95b21771dc1f6edacaed6755ab6da (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llgltfmateriallist.cpp')
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index b2d223a3e8..5cbf853179 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -92,7 +92,7 @@ LLGLTFMaterial* LLGLTFMaterialList::getMaterial(const LLUUID& id) if (loader.LoadASCIIFromString(&model_in, &error_msg, &warn_msg, data.c_str(), data.length(), "")) { - LLTinyGLTFHelper::setFromModel(mat, model_in); + LLTinyGLTFHelper::setFromModel(mat, model_in, 0); } else { |