diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 19:48:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 19:48:36 +0300 |
| commit | 3c833ce035c87e0f03ec8e46894d10adb33ad820 (patch) | |
| tree | f2ee6c215244bdea45440b1a753c83d19eace121 /indra/newview/llconversationmodel.cpp | |
| parent | ea4ddb5f40ee8dd253be0ac4229de90f1eef61a3 (diff) | |
| parent | 3713c33098ab98d840c0ed20bcbb5a1cb8e15235 (diff) | |
Merge pull request #1314 from secondlife/marchcat/b-merge
Release (Maint YZ) -> Maint B merge
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 9e043dbac0..f152e36cf5 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -37,8 +37,6 @@ #include "llimview.h" //For LLIMModel #include "lltrans.h" -#include <boost/foreach.hpp> - // // Conversation items : common behaviors // @@ -300,8 +298,7 @@ void LLConversationItemSession::updateName(LLConversationItemParticipant* partic // In the case of a P2P conversation, we need to grab the name of the other participant in the session instance itself // as we do not create participants for such a session. - LLFolderViewModelItem * itemp; - BOOST_FOREACH(itemp, mChildren) + for (auto itemp : mChildren) { LLConversationItem* current_participant = dynamic_cast<LLConversationItem*>(itemp); // Add the avatar uuid to the list (except if it's the own agent uuid) |