diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 17:29:13 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 17:29:13 -0500 |
| commit | 224667e1cc53d8b22e4b6107c3b0b274127941a7 (patch) | |
| tree | f97a250df10acd7314a29f1b92f56e0ce847c4e1 /indra/newview/llmaterialmgr.h | |
| parent | aec39a0f9f7f16a7970e96bad552ca684af57e3f (diff) | |
| parent | 152f32918d15e9343658b728adaf1d5c8c3c3e10 (diff) | |
SL-18330: Merge branch 'contribute' into sl-18330-merge
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 47c322357a..8f1ec8584b 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -93,7 +93,11 @@ private: bool operator==(const TEMaterialPair& b) const { return (materialID == b.materialID) && (te == b.te); } }; - + + // definitions follow class + friend std::hash<TEMaterialPair>; + friend size_t hash_value(const TEMaterialPair&) noexcept; + friend inline bool operator<( const LLMaterialMgr::TEMaterialPair& lhs, const LLMaterialMgr::TEMaterialPair& rhs) |