diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-01-22 13:28:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-22 13:28:19 +0200 |
| commit | 5533f58d41443971d667de52c1e73bf24e429247 (patch) | |
| tree | b5f823454cf491c4a83ecc8cf987cf465854ca30 /indra/llprimitive/llgltfmaterial.cpp | |
| parent | d0db6a49eb7c7dddcde2a340c8ad6c1f1af6e2cf (diff) | |
| parent | 8896239134a40f41d845c78551d24e005d691d7c (diff) | |
Merge develop into develop-linux
Merge pull request #5316 from RyeMutt/rye/devlinuxupdate
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp index 930222e3db..b2cd1dc597 100644 --- a/indra/llprimitive/llgltfmaterial.cpp +++ b/indra/llprimitive/llgltfmaterial.cpp @@ -214,7 +214,7 @@ std::string LLGLTFMaterial::asJSON(bool prettyprint) const // to WriteGltfSceneToStream in the viewer. gltf.WriteGltfSceneToStream(&model_out, str, prettyprint, false); - return str.str(); + return std::move(str).str(); } void LLGLTFMaterial::setFromModel(const tinygltf::Model& model, S32 mat_index) |