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:
@@ -326,11 +326,8 @@ void LLPanelExperiencePicker::filterContent()
|
||||
search_results->deleteAllItems();
|
||||
|
||||
LLSD item;
|
||||
LLSD::array_const_iterator it = experiences.beginArray();
|
||||
for ( ; it != experiences.endArray(); ++it)
|
||||
for (const auto& experience : experiences.array())
|
||||
{
|
||||
const LLSD& experience = *it;
|
||||
|
||||
if (isExperienceHidden(experience))
|
||||
continue;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user