diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-02 22:07:05 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-04-02 22:07:05 +0100 |
| commit | b0f82d7c08fe14a8d24b9fba0d3751387f90653c (patch) | |
| tree | 1b808fa4605374e62eac8e9f3d463d858a4ef720 | |
| parent | 267e31717cc89c97fc077ae6ffef13e5ce59f18d (diff) | |
| parent | f82548b931af69a08d53818ec7a96a967c05151c (diff) | |
merge
| -rw-r--r-- | indra/llui/llnotifications.h | 2 | ||||
| -rw-r--r-- | indra/newview/lltextureview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvocache.h | 2 |
4 files changed, 4 insertions, 4 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 b7786bcdd7..6da13da58c 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.h b/indra/newview/llviewerregion.h index 69fa42c1c8..d5266ec873 100644 --- a/indra/newview/llviewerregion.h +++ b/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(); 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(); |