merge MAINT-8474 changes

Thu, 12 Apr 2018 14:19:56 -0400

author
Oz Linden <oz@lindenlab.com>
date
Thu, 12 Apr 2018 14:19:56 -0400
changeset 55096
cfe9b2a47671
parent 55095
61703ff88f9b
parent 55093
61f735a3e4bf
child 55097
5b383f623170

merge MAINT-8474 changes

     1.1 --- a/indra/llui/llnotifications.h	Thu Apr 12 14:16:27 2018 -0400
     1.2 +++ b/indra/llui/llnotifications.h	Thu Apr 12 14:19:56 2018 -0400
     1.3 @@ -703,7 +703,7 @@
     1.4  {
     1.5  	struct orderByUUID
     1.6  	{
     1.7 -		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
     1.8 +		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) const
     1.9  		{
    1.10  			return lhs->id() < rhs->id();
    1.11  		}
     2.1 --- a/indra/newview/lltextureview.cpp	Thu Apr 12 14:16:27 2018 -0400
     2.2 +++ b/indra/newview/lltextureview.cpp	Thu Apr 12 14:19:56 2018 -0400
     2.3 @@ -736,7 +736,7 @@
     2.4  typedef std::pair<F32,LLViewerFetchedTexture*> decode_pair_t;
     2.5  struct compare_decode_pair
     2.6  {
     2.7 -	bool operator()(const decode_pair_t& a, const decode_pair_t& b)
     2.8 +	bool operator()(const decode_pair_t& a, const decode_pair_t& b) const
     2.9  	{
    2.10  		return a.first > b.first;
    2.11  	}
     3.1 --- a/indra/newview/llviewerregion.h	Thu Apr 12 14:16:27 2018 -0400
     3.2 +++ b/indra/newview/llviewerregion.h	Thu Apr 12 14:19:56 2018 -0400
     3.3 @@ -440,7 +440,7 @@
     3.4  
     3.5  	struct CompareRegionByLastUpdate
     3.6  	{
     3.7 -		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs)
     3.8 +		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) const
     3.9  		{
    3.10  			S32 lpa = lhs->getLastUpdate();
    3.11  			S32 rpa = rhs->getLastUpdate();
     4.1 --- a/indra/newview/llvocache.h	Thu Apr 12 14:16:27 2018 -0400
     4.2 +++ b/indra/newview/llvocache.h	Thu Apr 12 14:19:56 2018 -0400
     4.3 @@ -59,7 +59,7 @@
     4.4  
     4.5  	struct CompareVOCacheEntry
     4.6  	{
     4.7 -		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs)
     4.8 +		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) const
     4.9  		{
    4.10  			F32 lpa = lhs->getSceneContribution();
    4.11  			F32 rpa = rhs->getSceneContribution();

mercurial