diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llnotifications.h | 2 | ||||
| -rw-r--r-- | indra/newview/lltextureview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvocache.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index ccdfb90054..1509446920 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 b504e50cf4..d7b95db94f 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 bb0dbc6457..52dc3fbb69 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 69fb9c4d4e..302647215f 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -440,7 +440,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(); diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h index 7d450c5231..594d38249b 100644 --- a/indra/newview/llvocache.h +++ b/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(); |