Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

# Conflicts:
#	indra/llcommon/llsd.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewermessage.cpp
This commit is contained in:
Liru Færs
2020-02-25 06:16:07 -05:00
48 changed files with 305 additions and 411 deletions

View File

@@ -106,10 +106,9 @@ void LLPanelGroupExperiences::setExperienceList(const LLSD& experiences)
mExperiencesList->clear();
auto& cache = LLExperienceCache::instance();
LLSD::array_const_iterator it = experiences.beginArray();
for ( /**/ ; it != experiences.endArray(); ++it)
{
LLUUID public_key = it->asUUID();
for (const auto& exp : experiences.array())
{
LLUUID public_key = exp.asUUID();
if (public_key.notNull())
cache.get(public_key, boost::bind(addExperienceToList, _1, mExperiencesList));
}