diff options
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 8 | 
1 files changed, 6 insertions, 2 deletions
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()  | 
