diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-08-01 00:53:23 +0200 |
|---|---|---|
| committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-08-02 02:05:41 +0200 |
| commit | c71da80dc220920d47ba0c820b37475c5c4ffa07 (patch) | |
| tree | c4138cc0029e9ce0c5ec8a15d34488c35929aed4 /indra/newview | |
| parent | 62245de7ae38468f337e4c64bc2c254e13c6fedc (diff) | |
SL-19528 Remove PERMISSION_DEBIT warning from experience that is Grid and Privileged
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e7456f77bb..ce29238667 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5815,6 +5815,22 @@ void process_script_question(LLMessageSystem *msg, void **user_data) args["OBJECTNAME"] = object_name; args["NAME"] = clean_owner_name; S32 known_questions = 0; + + // SL-19346, SL-19528 - No DEBIT warning for GRID & PRIVILEGED + if (experienceid.notNull()) + { + const LLSD& experience = LLExperienceCache::instance().get(experienceid); + if (!experience.isUndefined()) + { + S32 properties = experience[LLExperienceCache::PROPERTIES].asInteger(); + if ((properties | LLExperienceCache::PROPERTY_GRID) && + (properties | LLExperienceCache::PROPERTY_PRIVILEGED)) + { + questions ^= SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit; + } + } + } + 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) |