diff options
Diffstat (limited to 'indra/newview')
| -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 | 
4 files changed, 10 insertions, 1 deletions
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"  | 
