diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-04 09:38:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-04 09:38:06 -0500 |
| commit | 68ec77127b158f0abffb6160eb7d870c85b278ad (patch) | |
| tree | ad43a05bb4a45449d27f4c077ef8ca653f35d7b9 /indra/llprimitive/llmaterialid.cpp | |
| parent | 19233999edfd143d0e7f8e3743dc07455d206172 (diff) | |
| parent | 7cc7ae873c5aeca9b5939176fb70677365e25395 (diff) | |
merge tonyas loop fixes
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 590f5cd91f..820f62c43c 100644 --- a/indra/llprimitive/llmaterialid.cpp +++ b/indra/llprimitive/llmaterialid.cpp @@ -150,6 +150,13 @@ std::string LLMaterialID::asString() const return materialIDString; } +std::ostream& operator<<(std::ostream& s, const LLMaterialID &material_id) +{ + s << material_id.asString(); + return s; +} + + void LLMaterialID::parseFromBinary (const LLSD::Binary& pMaterialID) { llassert(pMaterialID.size() == (MATERIAL_ID_SIZE * sizeof(U8))); |