livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
Brad Payne (Vir Linden) 2018-04-02 22:07:05 +01:00
parent 267e31717c f82548b931
commit b0f82d7c08
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llnotifications.h
View File

@ -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();
}

2
indra/newview/lltextureview.cpp
View File

@ -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;
}

2
indra/newview/llviewerregion.h
View File

@ -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();

2
indra/newview/llvocache.h
View File

@ -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();