diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-15 23:42:58 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-15 23:42:58 +0200 |
| commit | e2496eff18315a82a82e50784c5959dfb038d02f (patch) | |
| tree | 772198399cc2992d0350a47e8f4e4d62c80bcc0f | |
| parent | 23a3da37a91ea80311b5820c48a12d56b989f69d (diff) | |
SL-19159 Build fixes
| -rw-r--r-- | indra/llcommon/lluuid.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 5 | ||||
| -rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 1 |
5 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h index 2c36a1d222..cc36797bc1 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 diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 909f32cd21..9dfa29e848 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -42,6 +42,7 @@ #include "llinventoryfunctions.h" #include "llinventoryobserver.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..00b3321737 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); -private: +public: // struct for TE-specific material ID query class TEMaterialPair { @@ -93,7 +93,8 @@ private: bool operator==(const TEMaterialPair& b) const { return (materialID == b.materialID) && (te == b.te); } }; - + +private: 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..085356d9ed 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -40,6 +40,7 @@ #include "llinventorymodel.h" #include "lllineeditor.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" |