diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:09:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 22:09:54 +0200 |
| commit | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (patch) | |
| tree | 8e64e6074c11005fbb1dac606c176e4470de03e4 /indra/newview/llviewermessage.cpp | |
| parent | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff) | |
| parent | e3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (diff) | |
Merge pull request #735 from secondlife/marchcat/yz-merge
Merge Maint Z into Maint YZ
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 55e43352bc..221ead7667 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -119,8 +119,6 @@ #include "llviewerregion.h" #include "llfloaterregionrestarting.h" -#include <boost/foreach.hpp> - #include "llnotificationmanager.h" // #include "llexperiencecache.h" @@ -5626,7 +5624,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp BOOL caution = FALSE; S32 count = 0; std::string perms; - BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS) + for (const script_perm_t& script_perm : SCRIPT_PERMISSIONS) { if ((orig_questions & script_perm.permbit) && script_perm.caution) @@ -5870,7 +5868,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data) S32 known_questions = 0; bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit; // check the received permission flags against each permission - BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS) + for (const script_perm_t& script_perm : SCRIPT_PERMISSIONS) { if (questions & script_perm.permbit) { |