summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmaterialid.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-06-23 16:21:53 -0500
committerDave Parks <davep@lindenlab.com>2022-06-23 16:21:53 -0500
commit394479d7cc48a0170854e07f14267e28ba247990 (patch)
tree4e68623cf90138e851e082619d52b04c26949ea0 /indra/llprimitive/llmaterialid.cpp
parent54edd8ba8b824241f3d6df9e3ffff7a7c926665d (diff)
SL-17653 WIP - Apply GLTF material in Material Editor to selected object when you click "Save"
Diffstat (limited to 'indra/llprimitive/llmaterialid.cpp')
-rw-r--r--indra/llprimitive/llmaterialid.cpp7
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();