diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 16:50:18 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 16:50:18 -0500 |
| commit | 152f32918d15e9343658b728adaf1d5c8c3c3e10 (patch) | |
| tree | b8d2b43ced92998ed70455f9c8543277e56f102c | |
| parent | e2496eff18315a82a82e50784c5959dfb038d02f (diff) | |
SL-18330: Fix egregious existing build errors in contribute branch.
| -rw-r--r-- | indra/llcommon/lluuid.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 7 | ||||
| -rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h index cc36797bc1..0d4896ee97 100644 --- a/indra/llcommon/lluuid.h +++ b/indra/llcommon/lluuid.h @@ -191,4 +191,4 @@ inline size_t hash_value(const LLUUID& id) noexcept return (size_t)id.getDigest64(); } -#endif +#endif // LL_LLUUID_H diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 9dfa29e848..eff69df087 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -41,6 +41,7 @@ #include "llinventorybridge.h" #include "llinventoryfunctions.h" #include "llinventoryobserver.h" +#include "llmd5.h" #include "llnotificationsutil.h" #include "llmd5.h" #include "lloutfitobserver.h" diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 00b3321737..8f1ec8584b 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -82,7 +82,7 @@ private: void onPutResponse(bool success, const LLSD& content); void onRegionRemoved(LLViewerRegion* regionp); -public: +private: // struct for TE-specific material ID query class TEMaterialPair { @@ -94,7 +94,10 @@ public: bool operator==(const TEMaterialPair& b) const { return (materialID == b.materialID) && (te == b.te); } }; -private: + // 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 085356d9ed..ac6167ec01 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -39,6 +39,7 @@ #include "llinventorydefines.h" #include "llinventorymodel.h" #include "lllineeditor.h" +#include "llmd5.h" #include "llnotificationsutil.h" #include "llmd5.h" #include "llresmgr.h" |