diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 13:15:32 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-18 13:15:32 -0500 |
| commit | fea1d9f4d21ceccb6ebb13270c40ebbae737e769 (patch) | |
| tree | c6e4fa3a9c1f0ff39e3a65e4694b3bb891d2812e /indra/llprimitive/llmaterialid.cpp | |
| parent | 5fa7f69101a889009194eeddb927599d7536613f (diff) | |
| parent | fe796dac711c7ecdc7d6d17e0b692abf468b754a (diff) | |
SL-20546: Merge branch 'DRTVWR-588-maint-W' into sl-20546.
Diffstat (limited to 'indra/llprimitive/llmaterialid.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterialid.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp index f88a607c4f..340a83801c 100644 --- a/indra/llprimitive/llmaterialid.cpp +++ b/indra/llprimitive/llmaterialid.cpp @@ -155,6 +155,13 @@ std::string LLMaterialID::asString() const return materialIDString; } +LLUUID LLMaterialID::asUUID() const +{ + LLUUID ret; + memcpy(ret.mData, mID, MATERIAL_ID_SIZE); + return ret; +} + std::ostream& operator<<(std::ostream& s, const LLMaterialID &material_id) { s << material_id.asString(); |