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 | |
| parent | aec39a0f9f7f16a7970e96bad552ca684af57e3f (diff) | |
| parent | 152f32918d15e9343658b728adaf1d5c8c3c3e10 (diff) | |
SL-18330: Merge branch 'contribute' into sl-18330-merge
| -rw-r--r-- | indra/llcommon/lluuid.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 6 | ||||
| -rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 1 |
5 files changed, 12 insertions, 1 deletions
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h index 2c36a1d222..0d4896ee97 100644 --- a/indra/llcommon/lluuid.h +++ b/indra/llcommon/lluuid.h @@ -190,3 +190,5 @@ inline size_t hash_value(const LLUUID& id) noexcept { return (size_t)id.getDigest64(); } + +#endif // LL_LLUUID_H diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 909f32cd21..eff69df087 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -41,7 +41,9 @@ #include "llinventorybridge.h" #include "llinventoryfunctions.h" #include "llinventoryobserver.h" +#include "llmd5.h" #include "llnotificationsutil.h" +#include "llmd5.h" #include "lloutfitobserver.h" #include "lloutfitslist.h" #include "llselectmgr.h" 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) diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index 3fd4f51559..ac6167ec01 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -39,7 +39,9 @@ #include "llinventorydefines.h" #include "llinventorymodel.h" #include "lllineeditor.h" +#include "llmd5.h" #include "llnotificationsutil.h" +#include "llmd5.h" #include "llresmgr.h" #include "roles_constants.h" #include "llscrollbar.h" diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index d677a996c1..23c6cc01f5 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -40,6 +40,7 @@ #include "llinventorymodel.h" #include "llkeyboard.h" #include "lllineeditor.h" +#include "llmd5.h" #include "llhelp.h" #include "llnotificationsutil.h" #include "llresmgr.h" |