From c302e4ee967c5ceb2aff95e207a5f3fb8ac0ebb2 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Tue, 8 Jan 2019 15:04:10 -0800 Subject: SL-10268, SL-10323: Use _script_perm to display sit and change env questions. Exp log messages for environment changes." --- indra/newview/llviewermessage.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index eaa67e6755..0597347ca8 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -5763,19 +5763,16 @@ void process_script_question(LLMessageSystem *msg, void **user_data) // check whether permission question should cause special caution dialog caution |= (script_perm.caution); - if (("ScriptTakeMoney" == script_perm.question) && has_not_only_debit) + if ((("ScriptTakeMoney" == script_perm.question) && has_not_only_debit) || + (script_perm.question == "JoinAnExperience")) continue; - if (script_perm.question == "JoinAnExperience") - { // Some experience only permissions do not have an explicit permission bit. Add them here. - script_question += " " + LLTrans::getString("ForceSitAvatar") + "\n"; - script_question += " " + LLTrans::getString("ChangeEnvSettings") + "\n"; - } - script_question += " " + LLTrans::getString(script_perm.question) + "\n"; } } + script_question += "\n"; + args["QUESTIONS"] = script_question; if (known_questions != questions) -- cgit v1.2.3