diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 09:57:57 -0400 |
| commit | d844da2a6c5fc1a75e606150bb070fdb787698d3 (patch) | |
| tree | 349ecda36a5a561d6e564e2cc3db39121fd8946b /indra/newview/llviewermessage.cpp | |
| parent | 8a74efa38ba631be5400c4912a6339310968c9d7 (diff) | |
| parent | 7d05ade3f10563e8c202106e00cb3d273ab13338 (diff) | |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
to pick up new merge from main.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 84495bf78f..e7456f77bb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5823,12 +5823,8 @@ void process_script_question(LLMessageSystem *msg, void **user_data) { count++; known_questions |= script_perm.permbit; - - if (!LLMuteList::isLinden(owner_name)) - { - // check whether permission question should cause special caution dialog - caution |= (script_perm.caution); - } + // check whether permission question should cause special caution dialog + caution |= (script_perm.caution); if (("ScriptTakeMoney" == script_perm.question) && has_not_only_debit) continue; |
