From 075049d02c6e86eaf25cbe67556207247627a5e8 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Thu, 14 Jul 2022 10:46:24 -0700
Subject: [PATCH] DRTVWR-559 fix mac build again
---
indra/newview/llinventorybridge.cpp | 4 ++--
indra/newview/llmaterialeditor.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d325831c8fa..03c6996de67 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -785,7 +785,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
if (obj)
{
- if (obj->getType() != LLInventoryType::IT_CATEGORY)
+ if (obj->getType() != LLAssetType::AT_CATEGORY)
{
items.push_back(std::string("Copy Separator"));
}
@@ -881,7 +881,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
}
}
- if (obj->getType() != LLInventoryType::IT_CATEGORY)
+ if (obj->getType() != LLAssetType::AT_CATEGORY)
{
items.push_back(std::string("Paste Separator"));
}
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h
index dd0a17976ce..6196e3d3102 100644
--- a/indra/newview/llmaterialeditor.h
+++ b/indra/newview/llmaterialeditor.h
@@ -57,7 +57,7 @@ class LLMaterialEditor : public LLPreview, public LLVOInventoryListener
void setFromGLTFMaterial(LLGLTFMaterial* mat);
- void loadAsset();
+ void loadAsset() override;
static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status);
--
GitLab