diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index ccdfb90054938f91da1138ed0dd3d4661ab6f5f4..15094469208151af209dd380ae03503842edc111 100644
--- a/indra/llui/llnotifications.h
+++ b/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();
 		}
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index b504e50cf431c8e38ba5fa800a3db0c08e4aa48d..d7b95db94f9ecf51ef5e910206b535bc45215908 100644
--- a/indra/newview/lltextureview.cpp
+++ b/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;
 	}
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index bb0dbc6457f947ff5a398f275894b80b00b30ba0..52dc3fbb69b63e2663fcdfb0d80a5ef0e95850d4 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2876,7 +2876,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("ParcelVoiceInfoRequest");
 	capabilityNames.append("ProductInfoRequest");
 	capabilityNames.append("ProvisionVoiceAccountRequest");
-	capabilityNames.append("ReadOfflineMsgs");
+	//capabilityNames.append("ReadOfflineMsgs");
 	capabilityNames.append("RemoteParcelRequest");
 	capabilityNames.append("RenderMaterials");
 	capabilityNames.append("RequestTextureDownload");
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 69fb9c4d4e41d04bf83cac38e7492cc07ecbe8d5..302647215f7791935e9ebe3ea37c42795ef50efb 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -440,7 +440,7 @@ class LLViewerRegion: public LLCapabilityProvider // implements this interface
 
 	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();
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index 7d450c5231c9fb7661735ea0893bdc8b1b3628d5..594d38249bd07cdb5548414dd6ade6862aa2ab35 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -59,7 +59,7 @@ class LLVOCacheEntry
 
 	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();