Fix debit permission Allow being too long, and remove newlines from it

This commit is contained in:
Liru Færs
2020-02-09 04:34:31 -05:00
parent 400da6ec92
commit 0892d14933
2 changed files with 2 additions and 5 deletions

View File

@@ -7518,7 +7518,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
// [/RLVa:KB]
if (caution && gSavedSettings.getBOOL("PermissionsCautionEnabled"))
{
args["FOOTERTEXT"] = (count > 1) ? LLTrans::getString("AdditionalPermissionsRequestHeader") + "\n\n" + script_question : "";
args["FOOTERTEXT"] = (count > 1) ? LLTrans::getString("AdditionalPermissionsRequestHeader") + '\n' + script_question : LLStringUtil::null;
notification = "ScriptQuestionCaution";
}
else if (experienceid.notNull())

View File

@@ -8139,11 +8139,9 @@ Scripts associated with this experience will be able to do the following on regi
[QUESTIONS]
Is this OK?
<unique combine="combine_with_new">
<context>experience</context>
</unique>
<tag>confirm</tag>
<form name="form">
<button
index="3"
@@ -8175,13 +8173,12 @@ Warning: The object &apos;[OBJECTNAME]&apos; wants total access to your inworld
[FOOTERTEXT]
Do not allow access if you do not fully understand why it wants access to your account.
<tag>confirm</tag>
<form name="form">
<button
index="0"
name="Grant"
text="Allow total access"/>
text="Allow"/>
<button
default="true"
index="1"