diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-10-25 10:11:21 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-10-25 10:50:26 -0700 |
| commit | caed8871abd896775e0598641dca07e92dd895e7 (patch) | |
| tree | 1e31db1c05005fc8696f7ef843c8bfe22992798d /indra | |
| parent | 687a012a695bb7da55fc2b9b220f48de658cb8b6 (diff) | |
Xcode build fixes for DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index cd60d34d2f..05ed7a2019 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -119,7 +119,7 @@ void LLGLTFMaterialList::queueOverrideUpdate(const LLUUID& id, S32 side, LLGLTFM void LLGLTFMaterialList::applyQueuedOverrides(LLViewerObject* obj) { const LLUUID& id = obj->getID(); - auto& iter = mQueuedOverrides.find(id); + auto iter = mQueuedOverrides.find(id); if (iter != mQueuedOverrides.end()) { diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index ac519970b7..ac76ad7272 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5335,7 +5335,7 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma tep->setGLTFMaterialOverride(override_mat); // if override mat exists, we must also have a source mat - llassert(override_mat ? src_mat : true); + llassert(override_mat ? bool(src_mat) : true); if (override_mat && src_mat) { |