Skip to content

Commit c71da80

Browse files
committed
SL-19528 Remove PERMISSION_DEBIT warning from experience that is Grid and Privileged
1 parent 62245de commit c71da80

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

indra/newview/llviewermessage.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5815,6 +5815,22 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
58155815
args["OBJECTNAME"] = object_name;
58165816
args["NAME"] = clean_owner_name;
58175817
S32 known_questions = 0;
5818+
5819+
// SL-19346, SL-19528 - No DEBIT warning for GRID & PRIVILEGED
5820+
if (experienceid.notNull())
5821+
{
5822+
const LLSD& experience = LLExperienceCache::instance().get(experienceid);
5823+
if (!experience.isUndefined())
5824+
{
5825+
S32 properties = experience[LLExperienceCache::PROPERTIES].asInteger();
5826+
if ((properties | LLExperienceCache::PROPERTY_GRID) &&
5827+
(properties | LLExperienceCache::PROPERTY_PRIVILEGED))
5828+
{
5829+
questions ^= SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
5830+
}
5831+
}
5832+
}
5833+
58185834
bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
58195835
// check the received permission flags against each permission
58205836
BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)

0 commit comments

Comments
 (0)