Skip to content
Snippets Groups Projects
Commit 600ea64e authored by Alexander Gavriliuk's avatar Alexander Gavriliuk Committed by Guru
Browse files

SL-19528 Remove PERMISSION_DEBIT warning (revert recent change)

parent 7ea40635
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llviewermessage.cpp
+ 0
− 16
View file @ 600ea64e
...@@ -5815,22 +5815,6 @@ void process_script_question(LLMessageSystem *msg, void **user_data) ...@@ -5815,22 +5815,6 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
args["OBJECTNAME"] = object_name; args["OBJECTNAME"] = object_name;
args["NAME"] = clean_owner_name; args["NAME"] = clean_owner_name;
S32 known_questions = 0; 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; bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
// check the received permission flags against each permission // check the received permission flags against each permission
BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS) BOOST_FOREACH(script_perm_t script_perm, SCRIPT_PERMISSIONS)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment