From caed8871abd896775e0598641dca07e92dd895e7 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Tue, 25 Oct 2022 10:11:21 -0700
Subject: [PATCH] Xcode build fixes for DRTVWR-559
---
indra/newview/llgltfmateriallist.cpp | 2 +-
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 cd60d34d2f5..05ed7a20195 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 ac519970b74..ac76ad72722 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)
{
--
GitLab