merge

indra/llui/llnotifications.h

@@ -703,7 +703,7 @@ namespace LLNotificationComparators
 {
 	struct orderByUUID
 	{
-		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
+		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) const
 		{
 			return lhs->id() < rhs->id();
 		}

indra/newview/lltextureview.cpp

@@ -736,7 +736,7 @@ LLTextureView::~LLTextureView()
 typedef std::pair<F32,LLViewerFetchedTexture*> decode_pair_t;
 struct compare_decode_pair
 {
-	bool operator()(const decode_pair_t& a, const decode_pair_t& b)
+	bool operator()(const decode_pair_t& a, const decode_pair_t& b) const
 	{
 		return a.first > b.first;
 	}

indra/newview/llviewerregion.h

@@ -441,7 +441,7 @@ public:
 
 	struct CompareRegionByLastUpdate
 	{
-		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs)
+		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) const
 		{
 			S32 lpa = lhs->getLastUpdate();
 			S32 rpa = rhs->getLastUpdate();

indra/newview/llvocache.h

@@ -59,7 +59,7 @@ public:
 
 	struct CompareVOCacheEntry
 	{
-		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs)
+		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) const
 		{
 			F32 lpa = lhs->getSceneContribution();
 			F32 rpa = rhs->getSceneContribution();