diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 20:22:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-24 20:22:45 +0300 |
commit | 4c54488470a37f53f46c9d4694644a10b92b9790 (patch) | |
tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/newview/llconversationmodel.cpp | |
parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
parent | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff) |
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A 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 e4ae60b49e..44d4c863c7 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) |