diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-06-23 14:36:26 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-06-23 14:36:26 -0700 |
| commit | 861e7b6be812f450ed9b4580a8c7ca30d88a26dd (patch) | |
| tree | 4f08feb9a76e6a1f52c9d50d66c979d51f86cb64 /indra/llprimitive/llmaterialid.h | |
| parent | 8fa6bcb5a5abdf0c4649df65c900dee66c3ccddc (diff) | |
| parent | 394479d7cc48a0170854e07f14267e28ba247990 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llmaterialid.h')
| -rw-r--r-- | indra/llprimitive/llmaterialid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h index ee663f8f99..e6165dfc91 100644 --- a/indra/llprimitive/llmaterialid.h +++ b/indra/llprimitive/llmaterialid.h @@ -61,6 +61,7 @@ public: LLSD asLLSD() const; std::string asString() const; + LLUUID asUUID() const; friend std::ostream& operator<<(std::ostream& s, const LLMaterialID &material_id); |