From e7f562e6d8912573c255c8a6621c4f57d7df4b5c Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Mon, 15 Aug 2022 13:47:22 -0700 Subject: Fix for SL-17695 'Give materials and textures imported by Material Editor a sensible name' - compile error on mac/clang because it's more picky - as it should be in this case --- indra/newview/llmaterialeditor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index ffeb2db4df..7b17fb5fdf 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -705,9 +705,13 @@ const std::string LLMaterialEditor::buildMaterialDescription() } // sanitize the material description so that it's compatible with the inventory - LLInventoryObject::correctInventoryName(desc.str()); + // note: split this up because clang doesn't like operating directly on the + // str() - error: lvalue reference to type 'basic_string<...>' cannot bind to a + // temporary of type 'basic_string<...>' + std::string inv_desc = desc.str(); + LLInventoryObject::correctInventoryName(inv_desc); - return desc.str(); + return inv_desc; } bool LLMaterialEditor::saveIfNeeded() -- cgit v1.2.3