diff options
author | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-04-13 09:45:53 -0400 |
commit | 2c536cd91dcdb89319fc569f34ee49cfaccd8a5d (patch) | |
tree | ba304e9cc5bec1caebc360618cfa39bd8c3ffdd9 /indra/newview/lltextureview.cpp | |
parent | 4a684fb9e27be77f7069215b597bb0e7807757b3 (diff) | |
parent | 41f4e854732a7c75a813b2e99285cc41bde13e5e (diff) |
merge changes for 5.1.3-release
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rw-r--r-- | indra/newview/lltextureview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |