From a0e7dd45d950eef1c8f6bcc33f4035629189a7b9 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Tue, 1 Nov 2022 10:15:37 -0700 Subject: Fix mac build for DRTVWR-559. PROFILE_ZONE_SCOPED macro cant take an argument --- indra/newview/llgltfmateriallist.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index a4033f0d4d..dabacccf66 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -246,7 +246,7 @@ LLGLTFMaterial* LLGLTFMaterialList::getMaterial(const LLUUID& id) gAssetStorage->getAssetData(id, LLAssetType::AT_MATERIAL, [=](const LLUUID& id, LLAssetType::EType asset_type, void* user_data, S32 status, LLExtStat ext_status) { - LL_PROFILE_ZONE_SCOPED("gltf asset callback"); + LL_PROFILE_ZONE_NAMED("gltf asset callback"); if (status) { LL_WARNS() << "Error getting material asset data: " << LLAssetStorage::getErrorString(status) << " (" << status << ")" << LL_ENDL; @@ -255,7 +255,7 @@ LLGLTFMaterial* LLGLTFMaterialList::getMaterial(const LLUUID& id) std::vector buffer; { - LL_PROFILE_ZONE_SCOPED("gltf read asset"); + LL_PROFILE_ZONE_NAMED("gltf read asset"); LLFileSystem file(id, asset_type, LLFileSystem::READ); auto size = file.getSize(); if (!size) @@ -273,7 +273,7 @@ LLGLTFMaterial* LLGLTFMaterialList::getMaterial(const LLUUID& id) } { - LL_PROFILE_ZONE_SCOPED("gltf deserialize asset"); + LL_PROFILE_ZONE_NAMED("gltf deserialize asset"); LLSD asset; -- cgit v1.2.3