Merge LL viewer-release 5.1.3

Thu, 12 Apr 2018 21:09:38 +0200

author
Ansariel
date
Thu, 12 Apr 2018 21:09:38 +0200
changeset 55097
5b383f623170
parent 55092
99a950ce3bf6
parent 55096
cfe9b2a47671
child 55098
8c37968a0fb4

Merge LL viewer-release 5.1.3

.hgtags file | annotate | diff | revisions
indra/llui/llnotifications.h file | annotate | diff | revisions
indra/newview/VIEWER_VERSION.txt file | annotate | diff | revisions
indra/newview/lltextureview.cpp file | annotate | diff | revisions
indra/newview/llviewerregion.h file | annotate | diff | revisions
indra/newview/llvocache.h file | annotate | diff | revisions
     1.1 --- a/.hgtags	Thu Apr 12 21:08:02 2018 +0200
     1.2 +++ b/.hgtags	Thu Apr 12 21:09:38 2018 +0200
     1.3 @@ -572,3 +572,4 @@
     1.4  ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release
     1.5  26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release
     1.6  2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release
     1.7 +7c00e5b6cb3d95712e9d8e29277c805bca2bda90 5.1.3-release
     2.1 --- a/indra/llui/llnotifications.h	Thu Apr 12 21:08:02 2018 +0200
     2.2 +++ b/indra/llui/llnotifications.h	Thu Apr 12 21:09:38 2018 +0200
     2.3 @@ -709,7 +709,7 @@
     2.4  {
     2.5  	struct orderByUUID
     2.6  	{
     2.7 -		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs)
     2.8 +		bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) const
     2.9  		{
    2.10  			return lhs->id() < rhs->id();
    2.11  		}
     3.1 --- a/indra/newview/VIEWER_VERSION.txt	Thu Apr 12 21:08:02 2018 +0200
     3.2 +++ b/indra/newview/VIEWER_VERSION.txt	Thu Apr 12 21:09:38 2018 +0200
     3.3 @@ -1,1 +1,1 @@
     3.4 -5.1.3
     3.5 +5.1.4
     4.1 --- a/indra/newview/lltextureview.cpp	Thu Apr 12 21:08:02 2018 +0200
     4.2 +++ b/indra/newview/lltextureview.cpp	Thu Apr 12 21:09:38 2018 +0200
     4.3 @@ -845,7 +845,7 @@
     4.4  typedef std::pair<F32,LLViewerFetchedTexture*> decode_pair_t;
     4.5  struct compare_decode_pair
     4.6  {
     4.7 -	bool operator()(const decode_pair_t& a, const decode_pair_t& b)
     4.8 +	bool operator()(const decode_pair_t& a, const decode_pair_t& b) const
     4.9  	{
    4.10  		return a.first > b.first;
    4.11  	}
     5.1 --- a/indra/newview/llviewerregion.h	Thu Apr 12 21:08:02 2018 +0200
     5.2 +++ b/indra/newview/llviewerregion.h	Thu Apr 12 21:09:38 2018 +0200
     5.3 @@ -468,7 +468,7 @@
     5.4  
     5.5  	struct CompareRegionByLastUpdate
     5.6  	{
     5.7 -		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs)
     5.8 +		bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) const
     5.9  		{
    5.10  			S32 lpa = lhs->getLastUpdate();
    5.11  			S32 rpa = rhs->getLastUpdate();
     6.1 --- a/indra/newview/llvocache.h	Thu Apr 12 21:08:02 2018 +0200
     6.2 +++ b/indra/newview/llvocache.h	Thu Apr 12 21:09:38 2018 +0200
     6.3 @@ -59,7 +59,7 @@
     6.4  
     6.5  	struct CompareVOCacheEntry
     6.6  	{
     6.7 -		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs)
     6.8 +		bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) const
     6.9  		{
    6.10  			F32 lpa = lhs->getSceneContribution();
    6.11  			F32 rpa = rhs->getSceneContribution();

mercurial