summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-08-04 19:04:24 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-08-04 19:04:24 +0300
commit43425018e8485a423943cdbbfc00adb599eebaa6 (patch)
treee4ee6a63f6ea71c374ef61709b929d937f8a9191
parente8dc5e27ce00ad911bf04b4aef4bbcf6190930b9 (diff)
SL-15722 FIXED The experience permissions request dialog has "Force your avatar to sit" shown twice.
-rw-r--r--indra/newview/llviewermessage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 9c6c0d03db..236ae465f3 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5803,15 +5803,15 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
if (("ScriptTakeMoney" == script_perm.question) && has_not_only_debit)
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";
+ if (LLTrans::getString(script_perm.question).empty())
+ {
+ continue;
}
script_question += " " + LLTrans::getString(script_perm.question) + "\n";
}
}
-
+
args["QUESTIONS"] = script_question;
if (known_questions != questions)