From 8067bd824ecbf0f2c63a27937f3e36c4cbc99418 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 21 Nov 2018 12:51:41 -0800
Subject: [PATCH] SL-10117: Include environment changes in experience
agreement.
---
indra/newview/llviewermessage.cpp | 1 +
indra/newview/skins/default/xui/en/strings.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8f8b9afaf5e..eaa67e67556 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5769,6 +5769,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
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";
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 39c2cb79ada..33c2224b9dd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -531,6 +531,7 @@ http://secondlife.com/support for help fixing this problem.
<string name="ManageEstateSilently">Manage your estates silently</string>
<string name="ChangeYourDefaultAnimations">Change your default animations</string>
<string name="ForceSitAvatar">Force your avatar to sit</string>
+ <string name="ChangeEnvSettings">Change your environment settings</string>
<string name="NotConnected">Not Connected</string>
<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
--
GitLab