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