diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-04-03 14:58:58 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-04-03 14:58:58 -0700 |
| commit | 28b240fd7fc39ff4668e37b5aa3bdfe392415b34 (patch) | |
| tree | 923892b5ea9e9ac4d757fba089f0e9b2b24fbf26 /indra/llinventory/llparcel.cpp | |
| parent | 7b9866791ac7922f7527811bbc99c090f35e4cfd (diff) | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
DRTVWR-489: Fix things up after a messy merge with main because of a gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 134e783053..bba2e2505d 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -1271,5 +1271,5 @@ U32 LLParcel::countExperienceKeyType( U32 type ) return std::count_if( boost::begin(mExperienceKeys | boost::adaptors::map_values), boost::end(mExperienceKeys | boost::adaptors::map_values), - std::bind2nd(std::equal_to<U32>(), type)); + [type](U32 key){ return (key == type); }); } |