diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-05 19:18:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-05 19:18:09 +0300 |
| commit | 958f7812839160247207c01e78b90f1935022ab3 (patch) | |
| tree | 6ec615eb07b26a2ac2b07d747515847f8fdad0bd /indra/llprimitive/llmaterialid.cpp | |
| parent | b099dbef27f2af47a421bb9848cfbca1aaa08327 (diff) | |
| parent | 1296afd96a74877feb91690ec8dcd99b225554b8 (diff) | |
Merge pull request #1930 from RyeMutt/llsd-opts
Introduce move support and string_view to LLSD
Diffstat (limited to 'indra/llprimitive/llmaterialid.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterialid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp index 847824d770..4992b282f3 100644 --- a/indra/llprimitive/llmaterialid.cpp +++ b/indra/llprimitive/llmaterialid.cpp @@ -136,7 +136,7 @@ LLSD LLMaterialID::asLLSD() const materialIDBinary.resize(MATERIAL_ID_SIZE * sizeof(U8)); memcpy(materialIDBinary.data(), mID, MATERIAL_ID_SIZE * sizeof(U8)); - LLSD materialID = materialIDBinary; + LLSD materialID = std::move(materialIDBinary); return materialID; } |